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: f6423494 -s ours am: 63d40c49 -s ours am: 64ef0803 -s ours am: 4ff4bd60 -s ours" into tm-qpr-dev-plus-aosp am: b2273e8a -s ours

am skip reason: subject contains skip directive

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



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