[automerger skipped] Merge "Temporarily change uid to appId" into sc-dev am: 9bcaabb91c -s ours

am skip reason: Merged-In Iadec66344d88bd80170cd5441270b768cdbe0917 with SHA-1 0433dd20b7 is already in history

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

Change-Id: I62d71d1ca1e9ce5b007542cfd21ead5239537cc4