Merge "Add WearWifiMediatorService to SystemServer." into nyc-mr1-dev