Merge changes from topic "presubmit-am-18a7324d3163401db618e725a06a3dba" into sc-qpr1-dev am: a33cbebd8d am: ebfdc30b46

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

Change-Id: I14fae552827d0d74cf098951fd99a89ce783beea