Merge "Update dismiss appearance and add scrim per UX mocks." into rvc-dev am: a65d7258 am: a0728e61

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

Change-Id: If6682175aaf1425fd97df571faed951909c666fc