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

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

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



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