[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: bb5255b7d2 -s ours am: 329eb9d4b2 -s ours am: 47c160d537 -s ours am: 84da51d8cd -s ours am: e28bd02c04 -s ours am: cb5960c46a -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18446993 Change-Id: I153d5b405958a566f4d3f67fe7b2cf6a222501cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: