Merge "DO NOT MERGE: Fix the display id for testNewTaskSameDisplay" into oreo-cts-dev
am: efd22ea6c4  -s ours

Change-Id: Ie9cc41edb23cd15ee58a8cc9aaf6589de32b0150