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: 125630da

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



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