[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 am: 50449f82
Change-Id: If1fc280c2e622917918432e459b3855034a9fd04