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

[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 3e61e285 am: 9e0e0fb0 -s ours am: f4c1bd2c -s ours am: 624d25e8 -s ours am: 260bdd79 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I305d8fa829a78824dde60a0a8fdc9340fe603d5e