Merge "Allow java_sdk_library to override the droidstubs api_surface per...

Merge "Allow java_sdk_library to override the droidstubs api_surface per scope" into main am: fe132485

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3463281



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