Merge "Merge "Wait for valid state in testShowWhenLockedActivityAndPipActivity" into oreo-mr1-cts-dev am: 37cc5edfb4"
am: 9c4b0bf417

Change-Id: I966a430e231f2ae5a52b39777475b887c41c3fa0