[automerger skipped] Always show collapsed media on split shade am: 966cd418...

[automerger skipped] Always show collapsed media on split shade am: 966cd418 am: e15e7f71 -s ours

am skip reason: Merged-In Ia604ae9c48c627c468550150a5e6a38a3793efe5 with SHA-1 d548a423 is already in history

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

Change-Id: I15ab8aad1c77b3d253e86fc7ada25b0097ef7a9f