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

Change-Id: I57eb98a67c4b5b944ee1c8a99d95d915eea7b158