Merge "[automerger skipped] Merge "Move android.jar defaults back to f/b" am:...

Merge "[automerger skipped] Merge "Move android.jar defaults back to f/b" am: ebddedfd am: 52005fb6 am: ba08fc1d -s ours" into tm-dev am: cee8ebec -s ours am: 28344fbe -s ours

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

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

Change-Id: I7469a68848a8cb42851e798b3b60e3d9816b1ca1