Merge "Add bp-based disting of android stubs" into rvc-dev-plus-aosp am: c9de0dd4e2

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

Change-Id: I9f5fa89886f5220df89f3f145e2ce06c5a825e9a