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

Change-Id: I4ae1df7e2f88da0f3b75edc780095b65971bfcc1