Merge "Revert "Make media squishy for portrait shade open and close"" into...

Merge "Revert "Make media squishy for portrait shade open and close"" into tm-dev am: 5bcfb4c3 am: 0dd9f892 am: be0f9f70

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



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