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

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



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