[automerger skipped] Merge "Change NetworkCapabilties administrator UIDs to be...
[automerger skipped] Merge "Change NetworkCapabilties administrator UIDs to be stored as int[]." am: 70a08d9f am: c1d4a2fa -s ours
am skip reason: Change-Id I2652a5b0f276b8944454af5cb4b1383a3e054cfa with SHA-1 f7ac996f is in history
Change-Id: Id841d62573000973c6f97d94e583f16b4bf94f53