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

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

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



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