Merge "Fix getting target SDK version for uid in PermissionManagerService."