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

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



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