Merge "Make it configurable whether to start dream immediately on docking...

Merge "Make it configurable whether to start dream immediately on docking (when keyguard is unlocked)." into tm-dev am: 23b8a6d6 am: 7e761c41

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



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