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

am skip reason: subject contains skip directive

Change-Id: I04cee92c7f3560d6a596683d768d3d9bc85d661c