[automerger skipped] Merge "Add bp-based disting of android stubs" am:...

[automerger skipped] Merge "Add bp-based disting of android stubs" am: 6b54515b am: 3f54a52c -s ours am: fa06d8c9 -s ours am: 5fee124a -s ours am: 307275ad -s ours

am skip reason: Change-Id Id54507e297b5c57d1ce58f14eb347e7661a5328d with SHA-1 d116c603 is in history

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

Change-Id: Icd09c0962a0d5d830cb3d7e400f50704093b47e0