Merge "Don't replace an existing CoD with one that is unclassified" into main am: dfb1021c

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



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