[automerger skipped] Merge "[conflict] Merge "Add bounds checks in...

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

am skip reason: Merged-In I7a13261429797769cf5b913912a30e249668ac93 with SHA-1 46803ae9 is already in history

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



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