[automerger] Merge "Update ServiceWorkerClientTest CTS test to make sure SW is...
[automerger] Merge "Update ServiceWorkerClientTest CTS test to make sure SW is unregistered." into nougat-cts-dev am: 8719ff40 am: 6da6eb66 am: 3b426b5d
Change-Id: I35f5b9b7dd111704e36b949048cd7be857abe5d0