[automerger skipped] Merge "DO NOT MERGE use left/right insets instead of cutout" into qt-qpr1-dev am: 820aa463ac -s ours

am skip reason: subject contains skip directive

Change-Id: Ib77bb74b11711fb1f3b48c157ac0ec4450fd6934