[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into pi-dev am: 5c1ada4b -s ours am: cee788f5 am: c30148fd -s ours am: 18187223 am: 874bb1c2 am: 91385bc2 am: 45b08376 am: e3600887 -s ours

am skip reason: subject contains skip directive

Change-Id: I3eb7de32c008cc47d8cd79d48c1f7464c37b376d