tree b0815c4b03a66aa4e4ce286bbe6c1020c433c24c
parent 6a5b035e301a01ef60e8263c1b870456093e18e7
parent ce9134c982dbea703e78251459e0f3d0aafae1f0
author Winson Chung <winsonc@google.com> 1618977974 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618977974 +0000

Merge changes I69baed7b,I38a1da16 into sc-dev am: ce9134c982

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

Change-Id: I02e5b3d01b8db31b710dfe4e1856e0afd462e8c5