Merge "Clean up some fields and APIs in telephony HIDL interface." am: 4ba8b469d7 am: 1ac8fac9da
am: a84f3db341

Change-Id: I8711489cfa4782437399c2001bb57b45d7b02f72