Merge "Clear and restore callingIdentity for getSubscriberId to be able to...
Merge "Clear and restore callingIdentity for getSubscriberId to be able to call isActiveSubId with permission checks" into qt-r1-dev am: 8d78a8bd
am: 52da5c71
Change-Id: I84f96c699bfb4475e4c7520810ef8eb3bb451902