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

am skip reason: subject contains skip directive

Change-Id: Ib0708ca164443b156a31dd9082cf0ea259857c36