Merge "Check callingpackage to be consistent with callingUid" into sc-dev