Merge changes from topic "presubmit-am-4e0667c00fd14f20821e1bf2df948968" into sc-qpr1-dev am: 5976e12f9d am: 0c93a4adc7 am: c32ff19a69

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

Change-Id: I58d80244fafa119a321a6fa2064a6f3d30c0c3fa