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

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

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



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