tree 3865f477d95e2df8c88ea8a89ff6b2df27ff05d2
parent f655c6e4331e470bda3601a37d47e97556443d5b
parent 3e61e285ba6d0f83b60bf974f458c2448212cd31
author Bill Yi <byi@google.com> 1600492947 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600492947 +0000

Merge mainline-release 6664920 to master - DO NOT MERGE am: 3e61e285ba

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

Change-Id: I18706b4dabb87086c23bceb7df68705919471526