Merge "Remove NetworkCapabilities#combine*" am: 5469fa6e59 am: d5c9c3f4ae am: ad1cd95c10

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1919248

Change-Id: I58462f6d0303803ffd43333b67865c57edef39a3