[automerger skipped] Merge "Remove OnModeChangedListener when cleanup" into...

[automerger skipped] Merge "Remove OnModeChangedListener when cleanup" into tm-qpr-dev am: 2acc5bef -s ours

am skip reason: Merged-In Ia929a0832f0e59a1c68f91933bbd8c477e53ff3e with SHA-1 b9bcf4e3 is already in history

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



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