[automerger skipped] Sort administrator UIDs for NetworkCapabilities. am:...
[automerger skipped] Sort administrator UIDs for NetworkCapabilities. am: 93c1e656 am: 2bf058b2 am: 0428d186 am: 833019fd -s ours
am skip reason: Change-Id Ia5387ca2ce7c3fcbd04dc7fbff5266f7bcc71694 with SHA-1 93c1e656 is in history
Change-Id: Id4b3f4a55b37a13bde589e3e27e951c2366e4f59