[automerger skipped] Add combine() and equals() for NetworkCapabilities admin...
[automerger skipped] Add combine() and equals() for NetworkCapabilities admin UIDs. am: 981dccab am: ea9699a5 am: 1b65095e am: f73541f8 -s ours
am skip reason: Change-Id I803bdec80e27ee80d3a39844c5fb7aed584ab07d with SHA-1 981dccab is in history
Change-Id: Icc658f871f1d7646e68df996bbdb69c1e38c77dc