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

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

Change-Id: Ie44d5dc933c576911b4c36a5454da8cd5203867a