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

[automerger skipped] Merge "Revert "Make media squishy for portrait shade open and close"" into tm-dev am: 5bcfb4c3 am: 0dd9f892 am: be0f9f70 am: ee086331 -s ours

am skip reason: Merged-In Ifdada015563394a96c3d80ae527c68ac7323d4c2 with SHA-1 a24659d1 is already in history. Merged-In was found from reverted change.

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

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



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