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

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



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