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

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



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