[automerger skipped] Make sure callingPackage belongs to callingUid when...

[automerger skipped] Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions. am: b21cc11d -s ours am: 31f124c7 -s ours am: 175f6e77 -s ours

am skip reason: Merged-In Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89 with SHA-1 7fa1b4d0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18360946



Change-Id: I91887afe554b756e8f15c915f5411a8437936689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>