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

[automerger skipped] Merge "Revert "Revert "Move java_api_library modules to f/b/api/StubLib..."" into main am: d122f435 -s ours am: c83a3e67 -s ours am: 3b78e6c6 -s ours

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

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



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