[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: 43fe5936 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia56cb686494f3c604c8beef1e05da1144beba80a