[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into qt-dev am: 3d4cf346 am: 3e8ad0c6 -s ours am: d6d7e76e am: 64ee82bf am: a71f7758 am: 447091f6 -s ours

am skip reason: subject contains skip directive

Change-Id: Iff86dd6c87f446b286d6c9f271f8cbaac2255ebe