[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: 92c7cf10 am: 849c0d24 -s ours am: 24d3a935 -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: I0b17526620800e1a8e85c5671bdc814f6180b19a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>