Merge "[automerger skipped] [DO NOT MERGE] [conflict] Merge "Make sure...

Merge "[automerger skipped] [DO NOT MERGE] [conflict] Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into rvc-dev am: a70add46 am: a4bbe303 -s ours am: 043d3bd5 -s ours am: bb5255b7 -s ours am: 329eb9d4 -s ours am: 47c160d5 -s ours am: 5f9d51ba -s ours am: 8aabf0e6 -s ours" into tm-qpr-dev-plus-aosp am: fd8261e9 -s ours

am skip reason: subject contains skip directive

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



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