[automerger skipped] Merge "Add bp-based disting of android stubs" am: 6b54515b61 am: 3f54a52cc3 -s ours

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

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

Change-Id: I5db464913cba2e1964be38a3695d87493f94fbc3