Merge "Address media button session being changed" am: 75e0b4cd am:...

Merge "Address media button session being changed" am: 75e0b4cd am: 65066c67 am: 72f9c054 am: 8482afb6

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



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