[automerger skipped] Add combine() and equals() for NetworkCapabilities admin UIDs. am: 981dccab03 am: ea9699a505 -s ours
am skip reason: Change-Id I803bdec80e27ee80d3a39844c5fb7aed584ab07d with SHA-1 5fad8aa761 is in history
Change-Id: Ia706cfbcea4f390417a5af91a435e3f031e04b0c
This commit is contained in: