Merge "Allow FF leads to approve changes to android/os/flags.aconfig" into main am: c12581fb43 am: 5da7c77c08

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3351342

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