tree b516ef5077a63f6a51b9057c7954023e53a2b560
parent c5144afecd3c16fa2c0609e79097333c25ff4b01
parent c2434d052de88a8e9ca044b7dc46bfe57bedb7db
author Bill Yi <byi@google.com> 1621040884 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1621040884 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I1ca9e514636a99ff76d91e808ad6aacb0545d3dd