[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 am: 64d5a97d -s ours am: 26150116 -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: Ib69c4161ad0722149e33c04005b2e51c82f71f44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>