Merge "Catch NPE in getServiceStateForSubscriber"
am: c6e5a7197e

Change-Id: Icc615f3b403e57373bc2e339eba28fb653ed4d15