Merge "Don't start dreams immediately if keyguard is occluded when docked."...

Merge "Don't start dreams immediately if keyguard is occluded when docked." into tm-qpr-dev am: deb4e778

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



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