tree ab1406a07d880118d275e964066ff6df648f3073
parent ce0fdcb616c59edf7218e9051722cbd11d289166
parent ad1cd95c10e3b222241056ebcb2a07abd7d6146e
author Jean Chalard <jchalard@google.com> 1639482368 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639482368 +0000

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