[automerger skipped] Merge "Add Radio Interface Capabilities" am: e44156cfd6 am: c24ad90810 am: fa78c56da8 -s ours

am skip reason: Change-Id I56713e05cbd5200baa2a3bc79f7f4b0d580ad2a1 with SHA-1 6ceef2d6a5 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae4b4ab76d4944e203985101d6237279cf6c841e