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

Change-Id: I589c525fe3dfcec982266bf476f3634f88bfc295