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

Change-Id: I5081bdc8d87deaf2c0361a59598dfb99fd878481