Merge "resolve merge conflicts of 2e8356ba to...

Merge "resolve merge conflicts of 2e8356ba to sc-v2-dev-plus-aosp" into sc-v2-dev-plus-aosp am: d4b102db

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

Change-Id: I0fc03a187a9b7a1486879ebe43e40d70788df8c8