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

[automerger skipped] Merge "Revert "Move java_api_library modules to f/b/api/StubLibraries.bp"" into main am: da656f1b am: 7704a2e7 am: 0b767009 am: 7262f412 am: 78401e7e -s ours

am skip reason: Merged-In I479ec3b1554dcc6630207c5f095c6f9d211b035b with SHA-1 1f40645e is already in history. Merged-In was found from reverted change.

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

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



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