[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: 69b7183c am: 48b718b1

Change-Id: I635a53f250e4ae11680f8dbe9ba078516dd9a6ce