[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: a5e1d514 -s ours am: 01ecb45b -s ours am: c2086ec5 -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: Ia751bed1a6c501e7be44090c92e6c4a3cc96b513
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>