Merge "Revert "Move java_api_library modules to f/b/api/StubLibraries.bp"" into main am: da656f1b50 am: 7704a2e7b4

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

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