Merge changes from topic "enable-hidden-api" into main am: e100a884 am:...

Merge changes from topic "enable-hidden-api" into main am: e100a884 am: 632dd0ca am: b37ad3e3 am: 16f88007

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



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