Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: f8115452a7 am: 654c328426 am: 62160754cf

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404652

Change-Id: I148fd645e30d866073a883550628f4013569af3c