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

Change-Id: I9e9aadd93ad8691bcde1d1728f10c9eb0a4c348d