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

Change-Id: I8bba4f54e80e1706df9d21f3ac3820bc9c145466