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

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



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