[automerger skipped] Merge "Fix a potential OOB read resulted from integer...

[automerger skipped] Merge "Fix a potential OOB read resulted from integer underflow" into tm-dev am: 0e1b29ee am: e5db1de7 am: a0cdf997 -s ours am: 8e7a42ad -s ours

am skip reason: Merged-In I4744169dcca79ab3564f4e9e34bdf428cf678ed7 with SHA-1 b6433f14 is already in history

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



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