tree ccd7a184f1179ed2cf3606fe68683a1b0ab975a4
parent b634086d6ceb03ef96ad94082f6ff7a88165eed8
parent 9e0e0fb05f7065f62094930ab01cd14fc41f4379
author Bill Yi <byi@google.com> 1600494631 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600494631 +0000

[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 3e61e285ba am: 9e0e0fb05f -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: Ibe9f5c4975defa9f1b51579052f2616d1ff9ed25