Merge changes from topic "presubmit-am-30501b00e25a47e3a8031a0c6059a1ac" into...

Merge changes from topic "presubmit-am-30501b00e25a47e3a8031a0c6059a1ac" into tm-mainline-prod am: 198142e7

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



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