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

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

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