Merge "MetadataListener: only remove corresponding callbacks" into main am:...

Merge "MetadataListener: only remove corresponding callbacks" into main am: 81479ade am: 60b34e4d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3268080



Change-Id: Iff3d66a0563dc7ed70133095a5de4a577bdcedb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>