[automerger skipped] Merge "GetFullCapabilitySet use Radio HAL version instead...

[automerger skipped] Merge "GetFullCapabilitySet use Radio HAL version instead of RadioConfig" am: afd5b60e am: 1464e736 am: 35e6c7be am: 45fd7056 -s ours

am skip reason: Merged-In I3732277be710b168d6ed6d61a9ab6b5ae7c59987 with SHA-1 4dff78da is already in history

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

Change-Id: If616d601107e85a126b4c3b7781f3ce8744c4edf