[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
Change-Id: Iad44841420792a3d40fe8bb60ea508d8ab582e51