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

Merge changes from topic "presubmit-am-a27557f2cd3e4a2695ce355e447c91ac" into sc-v2-dev-plus-aosp am: b1b060c3

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



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