Merge "Move "when to dream" settings upwards for greater visibility" into tm-qpr-dev am: 3535dcfdf4 am: de1d043b8a

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

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