tree 3fddd41bfe4b061307924347282f799eefb3cf88
parent fa505670b036e30c8152728761c35ac14d69d89f
parent ee61dbb13a1249398a1daaed23128e6dd9b1bc48
author Yogisha Dixit <ydixit@google.com> 1624721452 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624721452 +0000

Merge "resolve merge conflicts of 1491ec31c596e69954a2735f02e7948f508b41e6 to sc-v2-dev" into sc-v2-dev am: 79d95df59d am: ee61dbb13a

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

Change-Id: I68cf65e2264ec4715b698edc1d8459e138af82c6