Merge "Add WearCellularMediatorService to the system server. am: d741f3de am: e0d2c77a" into nyc-mr2-dev-plus-aosp