[automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" am: d9c9ceec -s ours am: 6772e75a -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id6bc21f566eee79f19de15d17f657cac8b177ce0