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

Change-Id: I558dad7bbc41bc1dc30a72665da0d96e263e67ed