Merge "Support scaled cutout & roundedcorners when resolution is overridden"...

Merge "Support scaled cutout & roundedcorners when resolution is overridden" into tm-dev am: 88ed5ca1 am: 6de71620

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



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