Merge changes from topic "expose_flagged_api_revert" into main am: a7e5e29e...

Merge changes from topic "expose_flagged_api_revert" into main am: a7e5e29e am: 3d1cecda am: 40386ed3 am: f9503e96 am: 2e660fdb

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



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