Merge "Remove full api surface from-text stubs java_api_library modules" into...

Merge "Remove full api surface from-text stubs java_api_library modules" into main am: 43d59c53 am: 88854a8e

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



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