[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: d9bee407 am: 15074d96 am: cf007aa8 -s ours

am skip reason: subject contains skip directive

Change-Id: Ibffe36cc99388a05cd127034554ec8675dc9dd63