Merge "Add OEM_PRIVATE NetworkCapability"