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 am: df0177f9 am: 018912c0" into qt-r1-dev-plus-aosp
am: 6f445718
Change-Id: Iee79e769f07a8d7a9cfa84264899e941aeb2a2ab