[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 am: 816e5b25 Change-Id: I6bbaf5acdbcd0ef2bd649347b6b35a3930795f63