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

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



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