Merge changes from topic "presubmit-am-1d1cd88cc63d4a20a2e01c6e7836744e" into sc-mainline-prod am: 46aee81f94

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

Change-Id: I4034aa396a8e6452dca805e53b05f4d4faf4c9eb