[automerger skipped] Merge "Fix rounded corners cropping for letterbox" into...

[automerger skipped] Merge "Fix rounded corners cropping for letterbox" into tm-qpr-dev am: 40adcdd7 am: 949826ae -s ours

am skip reason: Merged-In Id1ac9252fbf102e321a89330aefda9ca2624fe66 with SHA-1 7a7c6d38 is already in history

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



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