Merge "Prevent IAE caused by empty media ids" into tm-dev am: 287e72fd am: bef00b71 am: 3e0d3ef9 am: cd209fde

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



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