[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into qt-dev am: 3d4cf346 am: 3e8ad0c6 -s ours am: d6d7e76e am: c4ed4254 am: 20c853e0 am: 1e4a27f0 -s ours

am skip reason: subject contains skip directive

Change-Id: Ia60dce2026c3f78b47fbc687b146475461c27259