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

Change-Id: I15e52f02c204805efacbd22eaad9a1e7218ff3ca