[automerger skipped] Merge "Update listener instead of creating a new one"...

[automerger skipped] Merge "Update listener instead of creating a new one" into rvc-qpr-dev am: 85c1b3eb am: 2ab3c844 -s ours

am skip reason: Change-Id Ic150156cc6078cd6477f48f05c8195d98a6d4fa4 with SHA-1 f5332923 is in history

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

Change-Id: I18b78a226cf5ad3790b3eda646a17b19121cb11d