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

Change-Id: I3efd4decbbeb46777c6546bba6c8f52a30669705