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

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

Change-Id: Ib62cc605d2e7e07b5c5b8ed022c3051d77ba0838