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 am: 5981e325

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



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