[automerger skipped] Merge "Changed WebViewActivityTest to set the service before the activity is launched." into oreo-mr1-cts-dev
am: a42d0d8be5  -s ours

Change-Id: Id9c6944a3a73eed0d46ef386adc45a4ba5ec6430