Merge "Minor changes to telephony error codes in types.hal"