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

am skip reason: subject contains skip directive

Change-Id: I1ceb382406b7b39714eb04480df10b23edf42d1c