Merge "Add Radio Interface Capabilities" am: e44156cfd6 am: c24ad90810

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522306

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I18cccffb56b7c6fd1c056075c914634235457722