Merge "Clear calling identity in getCarrierImsPackage()"