[automerger skipped] Merge "Don't collapse the shade when SHOW_BOUNCER" into...

[automerger skipped] Merge "Don't collapse the shade when SHOW_BOUNCER" into tm-qpr-dev am: 693e5f6d am: 9254a1f4 -s ours

am skip reason: Merged-In I5fcd53c4942a855d15dc1c11e22995761a69741c with SHA-1 f59c777f is already in history

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



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