Merge changes from topic "am-c036cb8107fa4697ae97e16bc8c57a94" into...

Merge changes from topic "am-c036cb8107fa4697ae97e16bc8c57a94" into tm-d1-dev-plus-aosp am: cc182042

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



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