Merge changes from topic "presubmit-am-cf03cdfdc7444d7faac91b866c05eae8" into sc-v2-dev-plus-aosp am: b7225856ad

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

Change-Id: I5595a2cf4bdc179c74d20a01e9249de7c14199ce