Merge "Merge "Add WearCellularMediatorService to the system server." into cw-f-dev am: 7a6c54128a am: 692089376b" into nyc-mr2-dev-plus-aosp
am: 9b02272ce5

Change-Id: I8027b976059f8a653ad62eef5d5ef13500999e81