Merge "Fix scrim inset bug in landscape shade" into udc-dev am: ee1c8091 am: ce42c932

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



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