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

Change-Id: If040bb85e2d7d58fc94b9366021c303d6176a546