Merge "Fix rounded corners cropping for letterbox" into tm-qpr-dev am: 40adcdd7

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



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