Merge changes from topic "presubmit-am-d74efe3712a04851a2e98ec622a5cf93" into sc-qpr1-dev am: c466421e1e

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

Change-Id: Ie17191cd65534a3f4141c0dd42a73043863969fd