[automerger skipped] Merge "Move java_api_library modules to...

[automerger skipped] Merge "Move java_api_library modules to f/b/api/StubLibraries.bp" into main am: 57ea4cea am: 4beab5bf am: be9dac09 am: fc36bd04 am: 8d514716 -s ours

am skip reason: Merged-In I479ec3b1554dcc6630207c5f095c6f9d211b035b with SHA-1 1f40645e is already in history

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



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