[automerger skipped] Fix shade collapse on keyguard with bypass enabled am: 6b80f7c41c -s ours am: 90dba95b7a -s ours

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

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

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