Merge changes from topic "presubmit-am-03e6d19cbcaa449ab324b779508f09b0" into sc-v2-dev-plus-aosp am: 22600599 am: 42b9f2eb am: b4f35b60

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

Change-Id: I32581341f5d424492025ce473f58ce4a17341043