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

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



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