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

[automerger skipped] Merge "Move java_api_library modules to f/b/api/StubLibraries.bp" into aosp-main-future am: 6eaafcd2 -s ours

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

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



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