Merge "[automerger skipped] Merge "DO NOT MERGE Respect rounded.xml size in...

Merge "[automerger skipped] Merge "DO NOT MERGE Respect rounded.xml size in ScreenDecorations" into qt-qpr1-dev am: 688ebd68 -s ours am: 547ddb0e am: 96ce6a1f" into rvc-d1-dev-plus-aosp am: 42047481

Change-Id: Ie5c164c98cf41f64bc4bba4cea0de05011fb4ae2