Fix NPE in getPhoneType/getEmailType

Change getPhoneType/getEmailType to return Integer instead of int. Rename
phoneHasType/emailHasType to hasPhoneType/hasEmailType and change to null
check return value of get methods.

Bug:24506801
Change-Id: If63ae76a93abcad646fc05b679d975c0d77b3f38
1 file changed
tree: eca7d65f08729c146299307ca0fe741abd28db8b
  1. src/
  2. TestCommon/
  3. tests/