Rearrange listener logic so it can be overriden

Bug: 144567659
Test: build, manual
Change-Id: I9f081fa8e0da1470fe15f5952a7d63448e43562f
1 file changed