Merge "Cache EIR UUIDs per Bluetooth address outside the pairing_cb_t" into...

Merge "Cache EIR UUIDs per Bluetooth address outside the pairing_cb_t" into tm-d1-dev am: c6f62aee am: 726d9326 am: 18209195

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



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