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

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



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