Merge "Keep dreaming when undocked when configured to." into tm-qpr-dev am:...

Merge "Keep dreaming when undocked when configured to." into tm-qpr-dev am: 01f14d68 am: 319c0b83

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20141168



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