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-plus-aosp am: be18a381

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



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