[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: 68309520 am: 0824c50c am: b0f3ca73 -s ours

am skip reason: subject contains skip directive

Change-Id: I2f4894b98edc5efda5221f3a9b78a127472c3561