Merge changes from topic "presubmit-am-0c24d9f255d6403d89a5c084b9bd0f1a" into sc-mainline-prod am: 7c26e9b89a

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

Change-Id: I65fa4d8e6c92fa51d148ddfec60d63c6e6cf5ddf