tree beaf8eb815739c4a5f5f193dd5b2b25cc26eb461
parent 06640b62d41ac3ba20e5aec9e5b7cf9bf31c4523
parent ce5458ff1b7286b74bfe694d264fbd4eb5821a62
author Bill Yi <byi@google.com> 1618364969 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618364969 +0000

[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 skip reason: subject contains skip directive

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

Change-Id: I5e8e63e5e680fa2cd0d94b9d3f5bfead853def55