Merge "Add WearCellularMediatorService to the system server. am: d741f3de81 am: e0d2c77a50" into nyc-mr2-dev-plus-aosp
am: 6a5bf5ef71

Change-Id: I72d10becb6deecc259dbb888c59f3449f0a1cf22