[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: 1a4d758e13

Change-Id: Ib6b2248c5742a1a7bf462529392fbab77ba840b6