[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: bf2d2265 -s ours am: b2004a9b -s ours am: 98221d88 -s ours

am skip reason: Change-Id I2652a5b0f276b8944454af5cb4b1383a3e054cfa with SHA-1 f7ac996f is in history

Change-Id: I6c9b04c86a2c226acd463daefc72788c6cc0056a