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: I47584aafc8b9e1833dd639bad523d7e9bd916828