[automerger skipped] Merge "Implement IRadio modules" am: 86c96c4a am:...

[automerger skipped] Merge "Implement IRadio modules" am: 86c96c4a am: f98f0e3e -s ours am: 7bfc6de9 -s ours

am skip reason: Merged-In Ie4df4638f94193ca839c7256ada95224532d46ed with SHA-1 bcfb7068 is already in history

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

Change-Id: If84486ae2e56d7aa5578ba24c96575ad33249556