Merge "Merge "Add WearCellularMediatorService to the system server." into cw-f-dev am: 7a6c5412 am: 69208937" into nyc-mr2-dev-plus-aosp