Merge "Revert "Migrate IDP_GRID_NAME usage to LauncherPrefs"" into tm-qpr-dev am: b7221177

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



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