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

am skip reason: skip tag Change-Id I31f76112edeb770bc3b9c017f6205392dbe3f5a8 with SHA-1 5dd7e72e is already in history

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

Change-Id: I53baf5ade2bf8c2a7c6b1edf852b4f397778c03c