RESTRICT AUTOMERGE

This reverts commit 7d4adf4d46caa7695c395e3e994e1d57a94ae92c.

Reason for revert: Breaks apps using Presentation in combination with private virtual displays

Bug: 141745510
Change-Id: I15ded4f1a7cf152e331c853c128c91db173f3cd7
2 files changed