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

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

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



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