Merge "Use appId instead of uid" am: 683c386403 am: 9658c8ea69 am: e6e75faf1d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733212

Change-Id: I553d03b3bfd2855d4d257e2f09e758f8a5d8b796