[automerger skipped] Merge "Fix some OOB errors in BTM parsing" into tm-dev...

[automerger skipped] Merge "Fix some OOB errors in BTM parsing" into tm-dev am: 9e249e5c am: 7d348ff0 am: 5040d587 -s ours am: a96fc61b -s ours am: 34cb3892 -s ours

am skip reason: Merged-In If7752f6edd749d6d5a4bb957b4824c22b5602737 with SHA-1 5d1a3feb is already in history

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



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