[automerger skipped] Fix shade collapse on keyguard with bypass enabled am: 6b80f7c4 -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: I04f82fc6372698f8554d7c9117317e6a3b301adb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>