[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: 0d9115d7 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If75dacfed93e4c9976db9fd4095750b09369a77d