DO NOT MERGE Rearrange listener logic so it can be overriden

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