[automerger skipped] Merge "Make sure callingPackage belongs to callingUid...

[automerger skipped] Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into sc-v2-dev am: c6576985 -s ours am: c6947c26 -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: If67eb1494fe0bfa764662e464ce7d177cd2f7a36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>