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

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

Change-Id: Ia3c730176ac21b90c2b44ad1cd56304d6b85ac4f