[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into pi-dev am: 5c1ada4bb3 -s ours

am skip reason: subject contains skip directive

Change-Id: Ib2a356e3e264ba7b3118b1bd3857b92a1425f58f