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

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

Change-Id: I3b5581de52bfdac1d2b8d81a7b7665fdf5185b38