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

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

Change-Id: I39023fe3a9b93ce89829044fbb5494fbb2b9eddc