Merge "Update dream settings categories, to fix padding." into tm-dev am:...

Merge "Update dream settings categories, to fix padding." into tm-dev am: dc8b0a5e am: 8a4420f4 am: 8bb46966

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



Change-Id: Ic59684289ca93cb005e65c8630b3b8c584e635c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>