[automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: f78b6ea2 -s ours am: 53673dd2 -s ours

am skip reason: skip tag Change-Id Ic4c3cfbde42e2318988c073662c95863bb13f27d with SHA-1 85e48c82 is already in history

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

Change-Id: Ied013374c954ac7b5f0b80a9ddb3f2d1c7f5814e