[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO...

[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: ac8fa290 -s ours am: 38e35f9a -s ours am: a2d9d504 -s ours

am skip reason: Change-Id I451c2ec603e6d3a00228726c894056a2be78dcf3 with SHA-1 2cb1e6bc is in history

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

Change-Id: I7bebb55cdc2447065ed70bd8bcc47c96b1fe004e