Merge changes from topic "qual-mps-av-suspend" am: 0002ef51 am: efd6b6e2...

Merge changes from topic "qual-mps-av-suspend" am: 0002ef51 am: efd6b6e2 am: ee1fa5a0 am: b7ab213d

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



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