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

[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into oc-dev am: 133e0a7e am: 4c05b628 am: d8c53a1c -s ours am: 7681dc17 -s ours am: 1a4d758e am: 85e70101 -s ours am: 6a344dba am: 3b74e49b am: ded61e64 am: 475b8dd6 am: 53788e05 -s ours

am skip reason: subject contains skip directive

Change-Id: I7e36e1c697ca731a398e10fd82c00b4da88178c4