Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class""