Merge changes from topic "presubmit-am-aa9635a5cca34b62b554abab1bb81b7d" into...

Merge changes from topic "presubmit-am-aa9635a5cca34b62b554abab1bb81b7d" into sc-v2-dev-plus-aosp am: ce7ce0ab

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



Change-Id: I3ac5372c24cc6d45db1f36462dbd5ce13d4e545e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>