[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows...

[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into oc-mr1-dev am: 3e2869e2 -s ours am: 72cb065b -s ours am: 43e857c5 am: dfe83c35 -s ours am: aec1836f am: d9bee407 am: 81247f37 am: e6d194a5 am: 616b7895 -s ours

am skip reason: subject contains skip directive

Change-Id: I3e8049f2a7721e2ba1e0c6730ae33e46b8545047