Merge changes from topic "presubmit-am-d74efe3712a04851a2e98ec622a5cf93" into...

Merge changes from topic "presubmit-am-d74efe3712a04851a2e98ec622a5cf93" into sc-qpr1-dev am: c466421e am: 767c5093 am: 93f92b26 am: cee4782f

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

Change-Id: I055551e5af3b6c90be01df287baa610f08cc194f