[automerger skipped] Merge "Merge RQ2A.210305.007" am: b1826d09 -s ours am:...

[automerger skipped] Merge "Merge RQ2A.210305.007" am: b1826d09 -s ours am: 3aa15f3f -s ours am: f053b135 -s ours

am skip reason: Change-Id Icc96bfa8a3d59a19194a154baeaffaea1281af0a with SHA-1 3be35ec2 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I90209e1790bc22ad0b3603172a6dd3b0e36ddbd3