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

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

Change-Id: I5cd9aa549b0fa250f0595126a06efdf6405f6cd3