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

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

Change-Id: Ic23e289c26e4b61864d1343eb0e6494f8cd43587