Merge "Validate OEM_PAID networks" am: f3ca3c54f7 am: fbcf647999

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1688270

Change-Id: Iecdf17a14f88eb2c1ee6e6faffa82bff85b83040