Merge "Update TelephonyManager document" am: 14faaf660d
am: eda353bc52

Change-Id: Id78189ec61aff200b4724da46e85bc69e01e95af