Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into tm-dev am: c872b772 am: 94c2c623

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



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