[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into pi-dev am: 5c1ada4bb3 -s ours am: cee788f5bd

Change-Id: I37ff5074f456b99ce450bdb65da44a35b73077c1