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

Merge "Merge "Fix scrim inset bug in landscape shade" into udc-dev am: ee1c8091 am: ce42c932" into udc-d1-dev-plus-aosp am: 253bc536

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



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