Merge "resolve merge conflicts of 46378eb8 to...

Merge "resolve merge conflicts of 46378eb8 to sc-v2-dev" into sc-v2-dev am: f3a387d7

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

Change-Id: If1169f6a7d1db4bed676d9d4a4039f830ab00077