[automerger skipped] Merge "Make media squishy for portrait shade open and...

[automerger skipped] Merge "Make media squishy for portrait shade open and close" into tm-dev am: 362dcaab am: f0ede521 -s ours

am skip reason: Merged-In Ifdada015563394a96c3d80ae527c68ac7323d4c2 with SHA-1 3f2eea47 is already in history

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

Change-Id: Ie928452c3f2fda3a3f115098f689cd52dc9398b9