[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: 6772aff5 -s ours am: 5084cfaf -s ours am: bc2a171f -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: Ief58370283ecb6d9f08a98e1785b27ef456a3446
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>