Merge changes from topic "am-815ae33323134b219271d85a3f065210" into...

Merge changes from topic "am-815ae33323134b219271d85a3f065210" into tm-qpr-dev-plus-aosp am: 4cd9cfbd

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



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