Merge changes from topics "presubmit-am-08ca1fad1fe94bf3ace5a708c5584d55",...

Merge changes from topics "presubmit-am-08ca1fad1fe94bf3ace5a708c5584d55", "presubmit-am-3c6c58a0fa374b92b1a5f8d5f5788871", "presubmit-am-6939eac1469540108813bd4ed4c60a9b" into tm-dev am: 98214d07 am: 365ce687

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

Change-Id: I9b14d454af357b0a0a65f3191a1b4dd1fe549ab0