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

Change-Id: Ifc130cd7a9d81b7aafb2b444d9f1a1c625a96b4a