[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into oc-mr1-dev am: 3e2869e2c0 -s ours am: 72cb065b97 -s ours am: 43e857c5c2 am: dfe83c3520 -s ours
am skip reason: subject contains skip directive Change-Id: I478af452abd4ef5bea3cabf150aab8ff09ae7769
This commit is contained in: