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

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

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

Change-Id: Iff24d0b2d4abebfc032124a8f5f1aadf6a762a05