[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows...

[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into oc-dev am: 133e0a7e am: 4c05b628 am: d8c53a1c -s ours am: 7681dc17 -s ours am: 1a4d758e

Change-Id: Ib6b2248c5742a1a7bf462529392fbab77ba840b6