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

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



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