[automerger skipped] Merge "Set creatorUid to NetworkCapabilities after connection" am: 3add2af3ad -s ours

am skip reason: Change-Id Id83cca080e1b7b03699a2dadf6d92c52f298730c with SHA-1 e77bf947ab is in history

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