Merge "Revert "Scrim now only scales horizontally"" into tm-dev am: 68e57d45...

Merge "Revert "Scrim now only scales horizontally"" into tm-dev am: 68e57d45 am: d601e05e am: b8bc4af6

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



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