[automerger] Merge "Update ServiceWorkerClientTest CTS test to make sure SW is unregistered." into nougat-cts-dev am: 8719ff4006 am: 6da6eb661e am: 3b426b5dc6 am: 7e3dc4fc52 am: 0428473820 am: 816e5b25e6

Change-Id: I6bbaf5acdbcd0ef2bd649347b6b35a3930795f63