Merge "Downgrade list of subIds in NetworkCapabilities to @SystemApi" am: c7c4b1323b am: 385ce8ed8a

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

Change-Id: Ib714d9a03e5b5152a576330711a8894178db4a95