[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: 70e2f947 am: 56efa9a0 am: 3db5f1e7 -s ours

am skip reason: subject contains skip directive

Change-Id: I5f07891e526e4ee3b953ee4eb4ad16f4bd99e0f6