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

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



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