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

Change-Id: I86bd891e9ed47af993cd7f573a122df06298f8ae