Merge "Fix NPE in UidPermissionPolicy"