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