Merge "Don't show KeyguardPresentation on the display which is always...

Merge "Don't show KeyguardPresentation on the display which is always unlocked" into tm-dev am: 300f68de

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



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