Merge "Scrim now only scales horizontally" into tm-dev am: d2d85c57 am: 8c452a65

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



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