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

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



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