Merge "Add ServiceState APIs for carrier aggregation." am: 185a89caf1
am: d529242eea

Change-Id: Id55c68bed1fceff1d6d83793b190188b42d99435