[automerger skipped] [DO NOT MERGE] [conflict] Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into rvc-dev am: a70add46f3 am: a4bbe303ff -s ours am: 043d3bd55f -s ours am: f642349402 -s ours am: 63d40c496e -s ours am: 002a760d74 -s ours am: 45ac7debdd -s ours am: ddc8025c2a -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18446993 Change-Id: I07c0fffe055afe98ea2ead01e3cc4a751b81fd8e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: