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

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

Change-Id: I7d2cb4615663743c9e2831f0d091c82fc973327a