Merge "Downgrade list of subIds in NetworkCapabilities to @SystemApi" am: 87e0ab8905 am: d5af88a835 am: 01001e2ddf

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

Change-Id: I7a85feb9753ae91ff3d67dc82c8bc880a6626074
tree: 50e99416f0d8d737127fff314ae540b5814c8450
  1. framework/
  2. service/
  3. services/
  4. test/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING