Merge "Move android.jar defaults back to f/b" am: ebddedfd9b

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

Change-Id: I0a9026889a6428dbd8797e8522d015e2417cb378