Merge "Update ServiceWorkerClientTest CTS test to make sure SW is unregistered." into nougat-cts-dev
am: 8719ff4006

Change-Id: I116983696834496f9305eace0fa3c7b5a69e7f0d