[automerger skipped] Merge "aidl: Fix missing conversion logic for broadcast...

[automerger skipped] Merge "aidl: Fix missing conversion logic for broadcast device" into tm-dev am: cd17169a am: 125630da -s ours

am skip reason: Merged-In I32e2ae9d6d433fb49e76ed3079cf85639eb71486 with SHA-1 2d1b9ae0 is already in history

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



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