Merge changes from topic "presubmit-am-18a7324d3163401db618e725a06a3dba" into...

Merge changes from topic "presubmit-am-18a7324d3163401db618e725a06a3dba" into sc-qpr1-dev am: a33cbebd am: 722d0b7e

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

Change-Id: Ieae62b9c14f0e857bd9e58cb862c9ef876c9b57c