[automerger skipped] Merge "More telephony updates for mainline." am: 5be8504888 am: 0f0dfaca35
am: 8468fd875d -s ours
am skip reason: change_id I39b6955cb14cc1ca68b05c620c3d09a2cdfe30c9 with SHA1 00d737bd17 is in history

Change-Id: Id8652d67230cfeb25dd422332d5b67b431f483b2