[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: I23ce0429d22548e48c28176bd7e421904f3bff06