[automerger skipped] Merge "Fix a remove*Listener call that doesn't remove"...

[automerger skipped] Merge "Fix a remove*Listener call that doesn't remove" into rvc-dev am: a95a24a0 am: 40540902 am: ffda3766 am: ea83471e -s ours

am skip reason: Change-Id I67b57e8df8a6d39622999634cefdc267fc07ecae with SHA-1 9a44590e is in history

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

Change-Id: I5d9b2e7c06fb08ab3c82268cbc70e5ee6897e4c1