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

Change-Id: I29cd805c04ea429fa61e9d62b4df8adaab21b3f1