Merge "Prevent IAE caused by empty media ids" into tm-dev am: 287e72fd am: 44616767 am: 6ed97b51 am: 29988fba

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



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