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

Merge "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: 85cd8b13 am: 2a033d13

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



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