[automerger skipped] Merge "Remove flag plugin with flag manager with DI" into...

[automerger skipped] Merge "Remove flag plugin with flag manager with DI" into sc-v2-dev am: 24e24658 am: b5c9e938 -s ours

am skip reason: Merged-In I43961a091f0f10ebd1a168f40703f0067d9f8a18 with SHA-1 55f00e7b is already in history

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

Change-Id: Ia52162b654b5c24a2bce0190f80468fd836eb4dc