Merge "[conflict] Merge "Add bounds checks in btif_avrcp_audio_track.cc" into...

Merge "[conflict] Merge "Add bounds checks in btif_avrcp_audio_track.cc" into tm-dev am: 0b68bd68 am: 52d169b1" into udc-dev am: 537a1a6c

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



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