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

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



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