Merge "Merge "Revert "Revert "Reland: EIR uuids should be added to...

Merge "Merge "Revert "Revert "Reland: EIR uuids should be added to device_found_cb am: 3154232a am: 1351819f am: ecf20624 am: 4791ca10 am: f7587cf6""" into tm-dev am: 634fb41d am: 4f957ae2" into tm-d1-dev-plus-aosp am: 22e6f241

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



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