Merge "Add java_api_library equivalence of android-non-updatable.stubs" am:...

Merge "Add java_api_library equivalence of android-non-updatable.stubs" am: 5afdb66e am: 39d42ecb am: 768693bb am: 7f3e3527 am: 790c43b3 am: 3c7c2ab7

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



Change-Id: I77a89ba4f4915cd6ee68171359fe3e2d454da208
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>