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 am: 790f7756 -s ours
am skip reason: subject contains skip directive

Change-Id: I3dabc3bceb1e1070d9f4762a2e1fccfe06fead6a