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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6a0fb0f0fb011feaab78b67e08cc3c6d29cc3d71