[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 -s ours

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

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

Change-Id: I64ba8b8f9ba63a1fe475f8147a92a3b04ca51cc6