Merge "Catch NPE in getServiceStateForSubscriber"