Merge changes from topic "presubmit-am-1224af9ca3f341a895e4bc19976e2bb8" into tm-dev am: a78e070a2e am: 08a01f5c41

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

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