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

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

Change-Id: Ie9733a3496be5f294d32e308232e2e59e674e4c3