[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 skip reason: subject contains skip directive

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

Change-Id: I69fd6ba13f8d923e61eecf799e9d1249511f004c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-06-24 01:51:00 +00:00
committed by Automerger Merge Worker

Diff Content Not Available