Merge "Add hidden systemapi hasCarrierPrivileges(pkgname) to PhoneInterfaceManager."