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

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



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