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

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

Change-Id: I463bbd643a0ad423ba6524029d51749810021fbe