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

Change-Id: Ie2426fd71273e2b48924e8c096b07409cfaed20e