Merge "Style updates" into sc-dev am: 468646cad7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3568c15be8920a64f8a422e463c81f9b8b59ceba