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

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

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