RESTRICT AUTOMERGE

Revert submission 10383599-type-presentation-q

Reason for revert: Breaks apps using Presentation in combination with private virtual displays
Reverted Changes:
I2aaab1903:RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows...
Ib5a24f8be:RESTRICT AUTOMERGE Add test for Presentation

Bug: 141745510
Bug: 152342138

Merged-In: I0b3a332c286900952b65ece12435f981e324cb5b
Change-Id: I0b3a332c286900952b65ece12435f981e324cb5b
(cherry picked from commit a9211d68)