[automerger skipped] Merge "Update TelephonyManager document" am: 14faaf660d am: eda353bc52
am: 523cf0bbcb  -s ours

Change-Id: I185bdebdb61219660e9cb3cbf2b5362b91ae5938