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

[automerger skipped] Merge "Merge "Fix a remove*Listener call that doesn't remove" into rvc-dev am: a95a24a0 am: 6e9f2d2a am: 37628631" into rvc-qpr-dev-plus-aosp am: fed65ff7 -s ours

am skip reason: Change-Id I67b57e8df8a6d39622999634cefdc267fc07ecae with SHA-1 5fa49551 is in history

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

Change-Id: Ia501f0121a1e206ca3e4b1af7818db85d2115b9a