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

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

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

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