Merge "Fixed notification scrim top corner radius" into udc-qpr-dev am: 31cbcd53

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



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