Merge "Fix some OOB errors in BTM parsing" into tm-dev am: 9e249e5c am: 71f5916b

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



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