Merge "Fix a bug that the uid in getCarrierPrivilegeStatus(int uid) is not used."