[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into oc-dev am: 133e0a7eea am: 4c05b6281c am: d8c53a1c5e -s ours am: 7681dc175c -s ours

am skip reason: subject contains skip directive

Change-Id: I942303ce75a7da38b24029b1f8792251687fddd2