Merge "Remove usages of @hide NetworkRequest.networkCapabilites" am: c006a84271 am: 924b4ee4b8

Change-Id: I8fd4ba9b5d5513d6a7c05efd15ea6ff327fb8267
tree: f769edb4fb2a08138baf9d293c902ec7d825b8c6
  1. service/
  2. PREUPLOAD.cfg