Merge "Remove redundant enforceCallingPermission()"