tree 87c56f266fa35e625ad34146f24c542440087bf1
parent 6e342b063386e2260e31b6ee9ceb660aba9b8e36
parent b94b6e0d3c9d366e3f42d919f52fe7678f4baf53
author Jonathan Miranda <jonmiranda@google.com> 1623892812 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623892812 +0000

resolve merge conflicts of 0bf000104fb16f4fd0dcbde19300a999398d428f to sc-v2-dev am: b94b6e0d3c

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

Change-Id: I4a28274974982eee6cf75201ce093de8b7729aca