[automerger skipped] Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE am: 85e48c8295 -s ours am: d63fa49285 -s ours am: ce5458ff1b -s ours am: 064daeff68 -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: I95b06c98a758a78808cdb26e195697395285e09a