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

Change-Id: Ifda1e16d03977ceac26bd237012068346d60dd86