Merge changes from topic "idp_grid_name" into tm-qpr-dev am: 78187b38 am: d78817b4

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



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