Merge "Improve privacy sources SC intent." into udc-mainline-prod am: 795a0307

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/23876591



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