[automerger] Merge "Merge "Update ServiceWorkerClientTest CTS test to make...
[automerger] Merge "Merge "Update ServiceWorkerClientTest CTS test to make sure SW is unregistered." into nougat-cts-dev am: 8719ff40" into nougat-mr1-cts-dev am: 12b4ca14 am: 9f067585
Change-Id: Ic935f0380317f5a94f5e9bc2250222a266b0ff7e