Merge "Correct uid to app id for netd traffic permission methods" am: 9fe8c8fc76

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

Change-Id: I11d1e21c7510c5f2d07198d8930134c6a9976708