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 am: 964cfb18

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



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