Merge "[CS01]Remove hidden API usage of NetworkCapabilities" am: 5f2492095f am: ade4218f81 am: 952d747c72

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2b32d56b4a00608b226c1d9b87b4e5b7818bd86
tree: 6bc18f7125101113fc6ad39f8c708c64b5ae140e
  1. framework/
  2. service/
  3. OWNERS