Merge "Catch NPE in getServiceStateForSubscriber" am: c6e5a7197e am: 915b05da82 am: afe9b6a11e
am: 2075ece6c1

Change-Id: I2f649660874e376f1b2319075814103bd4b40461