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

[automerger skipped] [conflict] Merge "Add bounds checks in btif_avrcp_audio_track.cc" into tm-dev am: 0b68bd68 am: 52d169b1 am: 3d7c7f4c -s ours

am skip reason: Merged-In I0389f56ae210b4976821e0ceeb21a7a0c2965a62 with SHA-1 e9b41ff0 is already in history

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



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