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

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

Change-Id: I25b2252cda8bbf16548a43fa76c690037bc9aa5a