Merge "Fix for Telephony Manager API javadoc inconsistencies" am: 59b88e0e6a am: 8a13455417

Change-Id: Iceb31e933b30363ce89a57305ad70fd5cabfa6fb