Merge changes from topic "am-e6212d83372f40f9baa0f3c1ef83ba35" into rvc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into oc-dev am: 133e0a7e am: 4c05b628 am: d8c53a1c -s ours am: 7681dc17 -s ours am: 1a4d758e am: 85e70101 -s ours am: 6a344dba am: 3b74e49b am: ded61e64 am: 475b8dd6
  [automerger skipped] RESTRICT AUTOMERGE am: 0bb93d4b am: d6f71cae am: b1fd7196 -s ours am: 102e9c59 -s ours am: 5fc924b4 am: 86ae0e54 -s ours am: dacc54a8 am: 438c12f2 am: 4dbeae2c am: d699813b