Merge "Changed WebViewActivityTest to set the service before the activity is launched." into oreo-mr1-cts-dev