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

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

Change-Id: I79aaf694eff56ca6b83d4fc179f95539ce8d93f3