Merge "RESTRICT AUTOMERGE Revert "Fix a type confusion bug in...

Merge "RESTRICT AUTOMERGE Revert "Fix a type confusion bug in bta_av_setconfig_rej"" into tm-dev am: 4c2af764 am: aec62eaa

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



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