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

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

Change-Id: I50feceebf62020e37e94a1e5b02d8dcddc84d978
tree: 4f244d0f234b4afba31ce6e270ea70ed2795d7de
  1. service/
  2. PREUPLOAD.cfg