Merge "create a flag to test flag migation" into main am: f024b4685e

Original change: https://android-review.googlesource.com/c/platform/development/+/3038460

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