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

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



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