Merge "Runtime permission attribution improvements" into sc-dev am: 222a2af548

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/13985763

Change-Id: Ied2b58e64161b39b0fdda932d3b736e9636c7e2e