Merge "Making sure shade doesn't open after unfolding when no security is set"...

Merge "Making sure shade doesn't open after unfolding when no security is set" into tm-qpr-dev am: 9452d3a8 am: 65cae8bf

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



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