[automerger skipped] Fix a few OOB issues in btm_ble_update_inq_result am:...

[automerger skipped] Fix a few OOB issues in btm_ble_update_inq_result am: 70ab2480 -s ours am: 5d18c858 -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: Id7d4708529f3ca15de4b7cf805b3930c580ed916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>