Merge "Temporarily change uid to appId" into sc-dev am: 9bcaabb91c

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

Change-Id: Ibbf30fffc0e70dec84b8ed10bbf719267313b820