[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 skip reason: skipped by user mpietal

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



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