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

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

Change-Id: I83a60ef55a796ff250ce9b244063191fef90e70b