Merge "floss: Fix breakage from EIR change" am: e5b6a86e am: 0f5e985e am:...

Merge "floss: Fix breakage from EIR change" am: e5b6a86e am: 0f5e985e am: b8abebe3 am: 747019cb am: 29cbed35

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



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