Merge "Match window rounded corners with system rounded corners." into...

Merge "Match window rounded corners with system rounded corners." into udc-qpr-dev am: 7493f376 am: b6911d37

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



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