Merge changes from topic "expose_flagged_api" into main am: af26c102 am:...

Merge changes from topic "expose_flagged_api" into main am: af26c102 am: ff593197 am: daa3a1a2

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



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