Merge changes from topic "am-e1db3a86f52d480885622c9b4069859e" into...

Merge changes from topic "am-e1db3a86f52d480885622c9b4069859e" into tm-qpr-dev-plus-aosp am: a60c3452

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



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