Merge changes from topic "fakefeatureflagsimpl" into main am: de521a1b am:...

Merge changes from topic "fakefeatureflagsimpl" into main am: de521a1b am: e1c055e5 am: 453ebacf am: 409f8a5c am: 44013fd0

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



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