Merge "resolve merge conflicts of 6d9e8666 to...

Merge "resolve merge conflicts of 6d9e8666 to sc-v2-dev" into sc-v2-dev am: 831225d8 am: 610a4b2f

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

Change-Id: I0287dd16e7648445841de5b235015943291acc3b