[automerger skipped] Merge "DO NOT MERGE use left/right insets instead of...

[automerger skipped] Merge "DO NOT MERGE use left/right insets instead of cutout" into qt-qpr1-dev am: 820aa463 -s ours am: df6a67cc am: 69885dfc am: 1bb996cf am: aa05d377 -s ours

am skip reason: subject contains skip directive

Change-Id: I2fd2bdcc501b0590cbfe1416de3c0efd7c285ab8