Merge "[automerger skipped] Merge "Merge "Merge "Update ServiceWorkerClientTest CTS test to make sure SW is unregistered." into nougat-cts-dev am: 8719ff4006" into nougat-mr1-cts-dev am: 12b4ca1499" into oreo-cts-dev am: c27b2fd836 -s ours am: 74b978ace1 -s ours am: 303e5d1e23 -s ours
am: 45609fc2a1 -s ours
am skip reason: change_id I5584935472bb6c936b9bace4f2f393d972a9151d with SHA1 69cafb0198 is in history

Change-Id: I06c975f5e80bc29bfdac8070c55a2cb01393c9ec