[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: 76085bc1 am: f905f53d -s ours

am skip reason: Merged-In I87a0df92710658d6c27d9b63ee7813a0d45a301a with SHA-1 359bdee1 is already in history

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



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