[automerger skipped] Fix shade collapse on keyguard with bypass enabled am: ed56528c -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/+/19886431



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