[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT...

[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 41e7da24 am: f6c4952b -s ours am: 3e726776 -s ours am: 83805b69 -s ours

am skip reason: Change-Id I0631b58f00dc0c39222e538a31e570206cf546f3 with SHA-1 b634086d is in history

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

Change-Id: I939ef2b29e45775c3f186e2b2d46393dc8edbee8