tree 403d7cb932b13cceed27d3d7127813a41dae1216
parent d4b102dbc55173ca695d5093b3c9242e1bdb4d11
parent 831225d8347e7882eb0928b00ff68b8ea6ea87aa
author Jonathan Miranda <jonmiranda@google.com> 1627099692 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1627099692 +0000

Merge "resolve merge conflicts of 6d9e8666694eeffda9b1cc3d0945c18249ebe824 to sc-v2-dev" into sc-v2-dev am: 831225d834

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

Change-Id: I0d7d07cf50e5ae66d0230a1ea76b407e6f98577b