Merge changes from topic "am-4a94c5aa144e4bda8edcbb2f691333dd" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "cherrypick-SPOOF_PACKAGE_NAME-zoqa9prsry" into sc-mainline-prod am: 05688a7e -s ours am: 4bb48591 -s ours am: 4874a851 -s ours am: 04823598 -s ours
  [automerger skipped] [automerge] Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions. 2p: eef20391 am: 8657d8e5 -s ours am: 75cb9256 -s ours am: 86021107 -s ours am: 7d76408e -s ours