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

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

Change-Id: I0d7d07cf50e5ae66d0230a1ea76b407e6f98577b