Merge "Move EXTRA_SERVICE_STATE from Intent to ServiceState."