[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into oc-mr1-dev am: 3e2869e2 -s ours am: 72cb065b -s ours am: 43e857c5 am: dfe83c35 -s ours am: aec1836f am: a760dead am: b57add47 am: a7d316b7 -s ours

am skip reason: subject contains skip directive

Change-Id: Iacfa5f068c8e9733ba2eebb71252d50585bd070e