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

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

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



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