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

Change-Id: I177744e8e569c6c96c5ad8b8d27b9630d1e7b64e