Merge "Fix clipping during media squishing and general behavior" into...

Merge "Fix clipping during media squishing and general behavior" into tm-qpr-dev am: c9e3c707 am: f526ee71

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



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