Merge changes from topic "presubmit-am-66c2d088f05444b5984eb37e35ba24a0" into tm-mainline-prod am: e3e4c9802f

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

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