Merge "More telephony updates for mainline."
am: 5be8504888

Change-Id: Ifbe3370b075651738e26c613c914dfb8e5ab3338