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

Merge "[automerger skipped] Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into sc-dev am: f6e715f9 -s ours am: 4a107edf -s ours am: 8e0c0c8b -s ours am: dd0ac21a -s ours am: 8db0861b -s ours" into tm-qpr-dev-plus-aosp am: bf061bfd -s ours

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

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



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