tree ce25744346501ff6a9bd124576529af3384d462c
parent 5dd7e72e1dc30ceeb37e7bc0c97842d90d6fc049
parent 85e48c8295d0dcd55a33824ef4175423e722c1e8
author Bill Yi <byi@google.com> 1618360271 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618360271 +0000

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

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

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

Change-Id: I53baf5ade2bf8c2a7c6b1edf852b4f397778c03c