[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

Change-Id: Iccc1e92b253ac9198e587d24903cc6468c4f0d47