Merge "Merge "Fix a remove*Listener call that doesn't remove" into rvc-dev am: a95a24a0a0 am: 6e9f2d2a65 am: 37628631c3" into rvc-qpr-dev-plus-aosp