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

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

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



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