[automerger skipped] Merge "Telephony mainline updates." am: fc9898a871 am: 111ac57ccb
am: 5e6efdc674 -s ours
am skip reason: change_id If1090036d349cc72f86d523b781e09cd37cf0871 with SHA1 5ddfdc9405 is in history

Change-Id: I9dd8033b6db135d03edc5868fbba258a68b4fbc7