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: e13d336e

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



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