Merge "Removing flag management UI states from flag definition" into tm-qpr-dev am: 839fc20f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21725630



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