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

Change-Id: Id83ddc2f1b6d686e6249132f0e32b5a109e180cb