Merge "Second half of fix for b/64985590. Updated test to use  AnimationTestActivity which is opaque, because the default configuration  of an app on Wear was to be transparent due to swipe to dismiss which  caused the test to fail when using TestActivity that takes on the  default transparency." into oreo-cts-dev