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

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



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