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

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

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



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