Merge "Floss: updating enum BtDeviceType and changing its default value" am:...

Merge "Floss: updating enum BtDeviceType and changing its default value" am: d804664a am: 30e22554 am: c068dacb am: ec54c3ef am: 31d78c7e

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



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