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

Change-Id: Ia3cc47e87315e31ef0064fd1ddce38210ce2e117