[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 am: 41f95138 am: 82775507 -s ours

am skip reason: subject contains skip directive

Change-Id: Ic7013d171c6cafa7cb0cedd19f8ff2698b787808