Merge changes from topic "b/260218332-1" into tm-qpr-dev am: 5dd52965

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



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