tree 3fddd41bfe4b061307924347282f799eefb3cf88
parent 06b7b3ead24b6bd2779beb7108dc6382c14961aa
parent 35205c1636af235ff0de65950b664e2cd7d81fa8
author Yogisha Dixit <ydixit@google.com> 1624721187 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624721187 +0000

Merge "resolve merge conflicts of a2e4c36d1c783863a50cd85ce4a13e3425e75573 to sc-v2-dev-plus-aosp" into sc-v2-dev-plus-aosp am: 35205c1636

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

Change-Id: I63f2d1672ffb37bdcc9b2f598e0c681d32c9e484