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