Merge "[automerger skipped] [DO NOT MERGE] [conflict] Merge "Make sure...

Merge "[automerger skipped] [DO NOT MERGE] [conflict] Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into rvc-dev am: a70add46 am: a4bbe303 -s ours am: 043d3bd5 -s ours am: bb5255b7 -s ours am: 329eb9d4 -s ours am: 47c160d5 -s ours am: 84da51d8 -s ours am: 5e748da7 -s ours" into tm-qpr-dev-plus-aosp