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

[automerger skipped] Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE am: 85e48c82 -s ours am: d63fa492 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6c77cea6a319dab0e1ca706592713f64db3070e4