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

Change-Id: I45cb98d4886996b4cef92f08f289f6ec9d8f0561