[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: be53e2fb -s ours am: 59c3eb26 -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: I23cd1e4d69df05436c5aeb4db5f7c45e4b2d315b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>