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

[automerger skipped] Merge "RESTRICT AUTOMERGE Revert "Fix a type confusion bug in bta_av_setconfig_rej"" into tm-dev am: 4c2af764 am: aec62eaa am: cb9ab4b8 -s ours am: e4b36167 -s ours am: dfac054b -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: I9e9e8c6417f240901741b4467aecbb1bba2a0dec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>