Merge "Do not use hidden telephony API PhoneConstants.PRESENTATION_*" am: 9636d7e3af
am: 9e294c69d3

Change-Id: Iddbe0533660d30d86ee932b481020b85eb91e176