Merge "[automerger skipped] Merge "Merge "Merge "Update...

Merge "[automerger skipped] Merge "Merge "Merge "Update ServiceWorkerClientTest CTS test to make sure SW is unregistered." into nougat-cts-dev am: 8719ff40" into nougat-mr1-cts-dev am: 12b4ca14" into oreo-cts-dev am: c27b2fd8 -s ours
am: 74b978ac -s ours
am skip reason: change_id I5584935472bb6c936b9bace4f2f393d972a9151d with SHA1 69cafb01 is in history

Change-Id: I35960b8d4499b1468d749dcc303a5d571b0743f4