tree b516ef5077a63f6a51b9057c7954023e53a2b560
parent 61d5c5deea11159acdb08092342f3f26c524e16b
parent 3b0e6a7064a938eea3da02c39e09b4dc0a8b3ee6
author Cyrus Boadway <boadway@google.com> 1621043637 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1621043637 +0000

Merge changes I65d2b1bc,I35bf9cb4 into sc-dev am: 5f35ff021d am: 3b0e6a7064

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

Change-Id: I2b0ee7b6c812b617be45dde7440e2206873e6fe8