[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 3e61e285 am: 9e0e0fb0 -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: Ibe9f5c4975defa9f1b51579052f2616d1ff9ed25