[automerger skipped] Sort administrator UIDs for NetworkCapabilities. am: 93c1e656b5 am: 2bf058b202 -s ours
am skip reason: Change-Id Ia5387ca2ce7c3fcbd04dc7fbff5266f7bcc71694 with SHA-1 2091bd9059 is in history
Change-Id: I3c4c90fa43ac063c5c10e5d0e5156b9cc53c3759
This commit is contained in: