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

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

Change-Id: I21f33adcb478800139621a6730ab4740647711a9