[automerger skipped] Fix type confusion in avdt_msg.cc am: 359bdee1 am:...

[automerger skipped] Fix type confusion in avdt_msg.cc am: 359bdee1 am: bb16cfa4 am: 2ab2b244 am: a2072aa7 -s ours

am skip reason: Merged-In Iea207e7e5e3d469ccbc81f5abf945723cf7b60d3 with SHA-1 60124336 is already in history

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



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