[automerger skipped] Merge "Include network owner as administrator for NetworkCapabilities." am: fbf338ef73 -s ours

am skip reason: Change-Id If5bb12fe33768dadd7f0f893631d89b95fc29a52 with SHA-1 d97506610c is in history

Change-Id: I29464649f9f04cb7f70d0b40bec6b5e570face29
tree: 20c5fb930740333ad55904baf9211db258c41607
  1. service/
  2. PREUPLOAD.cfg