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

Change-Id: I663bdc237ba16e60defe4bb9d8ccffd9ddede4b9