[automerger skipped] Merge "Fix a type confusion bug in bta_av_setconfig_rej"...

[automerger skipped] Merge "Fix a type confusion bug in bta_av_setconfig_rej" into tm-qpr-dev-plus-aosp am: 35b92d3f -s ours

am skip reason: Merged-In I78a1ee50dea0113381e51f8521711d758dc759cf with SHA-1 c02e35fe is already in history

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



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