[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 41e7da247f am: f6c4952bcc -s ours

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

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

Change-Id: Iacac1ebd1435d471ac979cffaa8e5d10ff7a9c32