tree ccd7a184f1179ed2cf3606fe68683a1b0ab975a4
parent f4c1bd2cb7ba314053744c6ac8514008290f5af4
parent f6c4952bcc79280333916ac5dd6e8857a462c312
author Bill Yi <byi@google.com> 1600494681 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600494681 +0000

[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 41e7da247f am: f6c4952bcc -s ours

am skip reason: Change-Id I0631b58f00dc0c39222e538a31e570206cf546f3 with SHA-1 b634086d6c is in history

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

Change-Id: Iacac1ebd1435d471ac979cffaa8e5d10ff7a9c32