Merge "Map RIL_RadioTechnologyFamily to RadioTechnologyFamily correctly" am: 4729b84992

Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1471647

Change-Id: I00e8a517b9cbb76fe78495bdad47941136958554