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