Merge "Re-apply "Add bp-based disting of android stubs"" into...

Merge "Re-apply "Add bp-based disting of android stubs"" into rvc-dev-plus-aosp am: b1db8662 am: 4b57d15f

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

Change-Id: I1da42b6e56e24a5b8525b341fda623a76a2624c0