Merge changes from topic "presubmit-am-03e6d19cbcaa449ab324b779508f09b0" into sc-v2-dev-plus-aosp am: 2260059974

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

Change-Id: I0a80543c89572479e780992b7fe1b7fcc8cbdbcd