tree 4bd62b87eadddf1cf52907826ee918ea6df2588e
parent 2cb1e6bcdac4dfdad3e8f75bb27ffe9d9702354e
parent ac8fa290535901356a42407f4fddbe79509fe435
author Bill Yi <byi@google.com> 1600118329 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600118329 +0000

[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: ac8fa29053 -s ours

am skip reason: Change-Id I451c2ec603e6d3a00228726c894056a2be78dcf3 with SHA-1 2cb1e6bcda is in history

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

Change-Id: I3e80b8951fce50bafa958854f4f928041b9931b0