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

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

Change-Id: I2a847a9b8b9907dea5b3f295342383fb8d16eb3d