[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" am: 78a8b1d9 am: 61e54b28 am: 52c3de62 -s ours

am skip reason: Merged-In Ie102647aab9776c8c9b9393812f6ca25dbf71d02 with SHA-1 24bf054f is already in history

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



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