[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: a2279696 am: 204b7d96 -s ours

am skip reason: subject contains skip directive

Change-Id: I1d592d4aee5b1ca99f511c301511879640881a57