[automerger skipped] Merge "[IRadioConfig] Applying new IRadioConfig AIDL" am:...

[automerger skipped] Merge "[IRadioConfig] Applying new IRadioConfig AIDL" am: 554e4fa4 am: a09aa2a2 am: 14f5a90b am: 1a5f6147 am: 1229520a -s ours

am skip reason: Merged-In Ifc4a86e23a9f0942790f88d208e573e06502a6fe with SHA-1 70a3726d is already in history

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

Change-Id: I1a0a5dcf66ad4a14334ad95439f5a7d3ef30bc0e