Merge "floss: metrics: convert device type into BlueZ compatible type" am:...

Merge "floss: metrics: convert device type into BlueZ compatible type" am: 6aa2d8e4 am: 30a6d0d4

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



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