[automerger skipped] Merge "Update preferences to Material Next styling" into...

[automerger skipped] Merge "Update preferences to Material Next styling" into sc-qpr1-dev am: e52a4e39 -s ours

am skip reason: Merged-In I346bbf819f3fe1eb13b47125b53c15baab11e439 with SHA-1 93031bc2 is already in history

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

Change-Id: I56c47fca463c096fd4164f0d9d4a8472412ce241