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

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

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