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

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



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