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

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



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