[automerger skipped] Merge "RIL changes for IRadio APIs" am: 6988247a am:...

[automerger skipped] Merge "RIL changes for IRadio APIs" am: 6988247a am: 0fde16da am: efdeaa78 am: 2baed1d0 -s ours

am skip reason: Merged-In Ib11a2d46fcfc3c836db90d9fc1d6be66b0f2be89 with SHA-1 0c3f318b is already in history

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

Change-Id: I1120273c812ea121452180709593998d510cddde