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

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



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