[automerger skipped] Merge "Fix shade collapse on keyguard with bypass...

[automerger skipped] Merge "Fix shade collapse on keyguard with bypass enabled" into tm-qpr-dev am: 0cdc1c79 -s ours am: 90d77e31 -s ours

am skip reason: Merged-In I99c6ced66f3269dbf4e6df1d078d7c793492c157 with SHA-1 e11a139f is already in history

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



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