[automerger skipped] Merge "Use appId instead of uid" into sc-dev am: eefacbcb5c -s ours am: cee2b58834 -s ours
am skip reason: Merged-In Ib8ea2185d8056bddb2ca5a8006f83afb3cffc9f4 with SHA-1 1e5d742596 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15123902
Change-Id: Icc45839b6042219d24facd441f5f4b5ea9016d64
This commit is contained in: