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

[automerger skipped] Merge "Fix shade collapse on keyguard with bypass enabled" into tm-d1-dev am: d1d5f8da -s ours am: 96b956d1 -s ours am: 0e3f0279 -s ours

am skip reason: skipped by user mpietal

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



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