Merge changes from topic "presubmit-am-a62f0e9adce947e1a367ff070ebd684f" into sc-v2-dev-plus-aosp am: 70712104

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



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