[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: 80fa2e73

Change-Id: I897b8fa539e26e89ecf3b8ef1431b5ad35ea1670