Merge "Remove dependence on Connection.Listener in Telephony."
am: 2e4e8b2279

Change-Id: Ic3988ff57db1b6875aaed25c6e1e5c26832fea40