[automerger skipped] Merge "[Settings] Replace #getServiceStateForSubscriber with #getServiceState" am: e8cf63ddd3 am: 8ead010c08 am: a58c7ba27a -s ours
am skip reason: Change-Id I8a1819b70a8d4ec56ae40f2b8b613bcd65a12b11 with SHA-1 e9c59f5fad is in history

Change-Id: I71bf1676d977129c86feb2200d44e83c98772663