Merge "Add a new SettingsCategoryPreference style" into rvc-dev am: ae1ed2508a

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

Change-Id: I7d8fb6ae02a41c2cc76241e3d3cd3252dbc8d459