Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into pi-dev am: 5c1ada4b -s ours am: cee788f5 am: c30148fd -s ours am: 18187223 am: 874bb1c2 am: 91385bc2 am: 45b08376" into rvc-qpr-dev-plus-aosp am: 050c38cb -s ours

am skip reason: subject contains skip directive

Change-Id: I457b59c69e40670e285ea21b07e54662af56942a