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