Merge "Add bp-based disting of android stubs" am: 6b54515b61

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

Change-Id: I7120ce6cc0c235f60476e0cb9bb5362a42f14a65