Merge "[DCK] Fix regression breaking IRK scanning" am: 6aa34391 am:...

Merge "[DCK] Fix regression breaking IRK scanning" am: 6aa34391 am: 26b652c2 am: 7a1796ee am: f174e019

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



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