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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18674055



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