Merge changes from topic "presubmit-am-ea2c5bf4ed4240198cb9e89cc342074c" into sc-qpr1-dev am: 5892321516 am: c0733c610e

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

Change-Id: I2e76edecc259efa56e06c8f52b7cc8adb4993aa7