Merge "Fix a remove*Listener call that doesn't remove" into rvc-dev am: a95a24a0a0 am: 4054090215

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837611

Change-Id: Ic909cbafb10ca466148728060793c9a4a09d5de5