Merge \\"Add WearWifiMediatorService to SystemServer.\\" into nyc-mr1-dev am: 0171a6ef8b
am: 2885331cef

Change-Id: I207eac40616bd5b2e462cc6c2b108cef883c2a9b