[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 skip reason: subject contains skip directive

Change-Id: I117494767666d32cae0e2c25ae3465988754ac15