[automerger skipped] Merge "Move android.jar defaults back to f/b" am: ebddedfd9b am: 52005fb6d0 am: ba08fc1d55 -s ours

am skip reason: Merged-In I464f78c524d84aca598affa8950a321e9d0cd22c with SHA-1 f8f417e5cd is already in history

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

Change-Id: I0b101b05bf7142f721ba15b8d128e582a7317b1e