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 am: 5cf2e5ac

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



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