Merge "Remove do_not_replace_existing_cod_with_uncategorized_cod flag" into...

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

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



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