Merge "Add OEM_PRIVATE NetworkCapability" am: 7415f6f9b5 am: 32fbc09bd0 am: 689181f342

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

Change-Id: Id8605eb5f8f4d8b977ff04359a12061c68527971