[automerger skipped] Merge "Use cached SubscriptionInfo from active subInfos,...

[automerger skipped] Merge "Use cached SubscriptionInfo from active subInfos, so that for each carrierPrivilege permission check we are not making a db query, therefore reducing race condition" am: 0506228d am: 85207297 -s ours am: a6ecd9ff -s ours

am skip reason: Change-Id I476cff11c216f4177d208e9c91d06f351dcd5ec6 with SHA-1 e3854786 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1322993

Change-Id: I7cd85b8de0e136ddf4b977fdd825928c742d09c5