Merge "Merge "Update dismiss appearance and add scrim per UX mocks." into rvc-dev am: a65d7258 am: 81d8cabe am: e21dca95" into rvc-qpr-dev-plus-aosp am: ce665c3b

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

Change-Id: I87b9dafabfdf1d904363d395f53496ab6cc486b6