Merge changes from topic "hiddenapi_exportable" into main am: 7e9343b889 am: cf38079804

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

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