tree 16124935f1f15a8e6106cc2c9f781be6b1763435
parent 16299f8796c578a2a74dab777e87f80b373b8cd9
parent 6e9f2d2a65063a46694848c22d155dfb51dcae76
author Neil Fuller <nfuller@google.com> 1591979310 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591979310 +0000

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

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

Change-Id: I26480648a5f1f6dc02ea5e3a633f4b127e47298e