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

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

Change-Id: I2dcace8bf1ac147afd3827ef560ddb5217e8e888