[automerger skipped] Merge "Add Radio Interface Capabilities" am: 235b6090...

[automerger skipped] Merge "Add Radio Interface Capabilities" am: 235b6090 am: d438ea44 am: 4d39b60e -s ours

am skip reason: Change-Id I5d213ccc7554a7be2c42f2b9cc23fb15577bab00 with SHA-1 074b759f is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id8e40f144261e816e01386d1bf13ce3c09c2731c