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

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



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