Merge "Remove do_not_replace_existing_cod_with_uncategorized_cod flag" into main am: 1af41541

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



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