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

Merge "[automerger skipped] Merge "aidl: Fix missing conversion logic for broadcast device" into tm-dev am: cd17169a am: 125630da -s ours am: 393bdb43 -s ours" into tm-qpr-dev-plus-aosp am: 33f319f0 -s ours

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

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



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