[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 am: 85e70101 -s ours am: 6a344dba am: 3b74e49b am: ded61e64

Change-Id: I77c2c783ba29a15bc4b69c3922145ed3ffb3a1eb