[automerger skipped] Merge "Convert existing flags to new system." into...

[automerger skipped] Merge "Convert existing flags to new system." into sc-v2-dev am: 104ef43d am: a2f5d76a -s ours

am skip reason: Merged-In Id03fe61b6697bf98fdd225ba252de58e07c42496 with SHA-1 0026b204 is already in history

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

Change-Id: I2b761583f1c0059e3d0f99b15ad4ed27e46856cb