tree 3d005e580ced64b03d4af3f9c9274b33f70ea829
parent 8c5c283990e7093ee5e5fe499e5cc70fd4ce130e
parent ce9134c982dbea703e78251459e0f3d0aafae1f0
author Winson Chung <winsonc@google.com> 1618978027 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618978027 +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: Ie20dfd376ae72d241e01a66c473db678306dabd7