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

[automerger skipped] Fix type confusion in avdt_msg.cc am: 359bdee1 am: 7dac70b3 am: 11c17aa1 -s ours am: cc0419a9 -s ours am: 54530688 -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: If7c2fd4479d31b11aeffbcdc4444dd2d9f2461fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>