Merge "Move feature flags that have been changed to the top of the list." into...

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

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



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