[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: 9ffc1c87 am: baefa179 -s ours

am skip reason: subject contains skip directive

Change-Id: I02b00e1ef782d98d75f99a8c1bcf9152add6e8df