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