Merge "Downgrade list of subIds in NetworkCapabilities to @SystemApi" am: 42d706acfc

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

Change-Id: I4dc51bf65af853a7510586169caa12b083c2f94b