Merge "Move feature flags that have been changed to the top of the list." into tm-qpr-dev am: 47bea3eb5b am: df4e63d922

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

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