[automerger skipped] RESTRICT AUTOMERGE Revert "Fix a type confusion bug in...

[automerger skipped] RESTRICT AUTOMERGE Revert "Fix a type confusion bug in bta_av_setconfig_rej" am: 5a4c8f3b am: d3b74266 am: 847a7d64 -s ours am: ca08954e -s ours am: 1a375884 -s ours

am skip reason: subject contains skip directive

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



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