Merge "Temporarily change uid to appId" am: 1e4d4001f4

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

Change-Id: I2fb613b4f846605e4643c5b21dd7d5cfac2a3cc3