[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into oc-dev am: 133e0a7eea am: 4c05b6281c am: d8c53a1c5e -s ours am: 7681dc175c -s ours am: 1a4d758e13 am: 85e7010138 -s ours

am skip reason: subject contains skip directive

Change-Id: I536cba4beaa800ce56f7856c57a874f269fa0929