[automerger skipped] Merge "Fix a few OOB issues in btm_ble_update_inq_result"...

[automerger skipped] Merge "Fix a few OOB issues in btm_ble_update_inq_result" into tm-qpr-dev am: 03077e74 -s ours am: 2aa2dbb0 -s ours

am skip reason: Merged-In Ie102647aab9776c8c9b9393812f6ca25dbf71d02 with SHA-1 19037d9b is already in history

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



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