Merge "Ensure calling package name and uid are matched" into sc-qpr1-dev am: e93efb6f96 am: 0a2d680a4d

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

Change-Id: Ic5f8107f9c64ed92cd1f76c001a042e8aba36074