Merge "[Settings] Replace #getServiceStateForSubscriber with #getServiceState"
am: e8cf63ddd3

Change-Id: I1bd0fc19e4150e26ebd2418b0c2b3b7dca41e605