[automerge] Move android.jar defaults back to f/b 2p: f8f417e5cd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17070492

Change-Id: Icdca7979027cbd1e18ca8afa7fddc15de762b2f8