Merge "Validate OEM_PAID networks" am: f3ca3c54f7

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

Change-Id: Ib9d7775401fd209c1f25958b9dda168d22d53356