Merge "Make Connection.Listener methods package private." am: 9c3abc4692
am: 48c29257d3

Change-Id: If9d17ce72d7e4cc25472882e851506c6a8972d2b