[automerger skipped] [automerge] Make sure callingPackage belongs to...

[automerger skipped] [automerge] Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions. 2p: eef20391 am: ca3e85e5 -s ours am: f2c58bf7 -s ours am: 869d4e32 -s ours am: 24d5e6a1 -s ours am: 9341edce -s ours am: d1c08bab -s ours

am skip reason: Merged-In Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89 with SHA-1 023509e4 is already in history

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



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