Merge "Minor changes to telephony error codes in types.hal" am: 044e84cc8a am: 455f722a8f
am: c336568957

Change-Id: Ib036b209a32ce4966da1c093967453f4719e0963