Merge "Clear calling identity in getCarrierImsPackage()" into oc-dev
TreeHugger Robot [Thu, 8 Jun 2017 20:16:35 +0000 (20:16 +0000)]

Trivial merge