Merge "Clear caller identity in doesPackageHaveCallingUid helper method so it can work across users." into sc-v2-dev