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

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

Change-Id: I173b6aa1e08771c268431274c34c283d9b9c78c8