Merge changes from topic "presubmit-am-65236292503c47e89824f0dfda012d6a" into tm-mainline-prod am: 6d9f02efb7

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

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