Merge "Catch NPE in getServiceStateForSubscriber" into qt-dev
am: cc36a441dd

Change-Id: Iab34493d91e46889424431191f979e3fe8d932f1