[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into oc-mr1-dev am: 3e2869e2c0 -s ours am: 72cb065b97 -s ours am: 43e857c5c2

Change-Id: Ibc0c561c040e64cade2b70b06cf904481b7b527b