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

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

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



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