Merge "aidl: Fix missing conversion logic for broadcast device" into tm-qpr-dev