Merge "Floss: Match cod based on major and minor class" am: dc2b9f32 am:...

Merge "Floss: Match cod based on major and minor class" am: dc2b9f32 am: 153553b6 am: bd8ddef7

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



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