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

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

Change-Id: I2386fb4f58be5a93a666efdb37d31177d6247105