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: abb06fd6 -s ours am: 80e3a1f8 -s ours am: 0fca1ee0 -s ours am: 09dfad10 -s ours am: 0e58102d -s ours" into tm-qpr-dev-plus-aosp am: f611998e -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: Id7e4944549be9a76ccd6d54fe2a4c99bdbeafd36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>