Merge "Correct uid to app id for netd traffic permission methods" am: 9fe8c8fc76 am: 2fe543353b am: 03cc875150 am: 7b1782be5c am: 9140a66d27

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

Change-Id: Ic6562e344057ed295691d1b55020adb362b4cfe4