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

Change-Id: I09b5a5955ace18d045f20a5d39b93d8e30096816