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: Ic3d593c9d0d8774b97b256b06f5e8b0af6e2ce43