tree ce25744346501ff6a9bd124576529af3384d462c
parent d63fa492852ce5fc419ae6e6599473fabd21149d
parent 53673dd2ca50499f9eacd324e48aee7a331a802f
author Bill Yi <byi@google.com> 1618381882 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618381882 +0000

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

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

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

Change-Id: Ied013374c954ac7b5f0b80a9ddb3f2d1c7f5814e