Merge changes from topic "presubmit-am-0c24d9f255d6403d89a5c084b9bd0f1a" into sc-qpr1-dev am: 6fc1f0fb

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

Change-Id: I6d7dbf0387552cbeca8fa000417017d07e714755