Merge "Add OEM_PRIVATE NetworkCapability" am: 7415f6f9b5

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

Change-Id: I3c1adf377b08bfce35ca0d341035462ee3dbd2c6