[automerger skipped] AidlConversion: Implement conversion between types from...

[automerger skipped] AidlConversion: Implement conversion between types from CPP and NDK am: bfbb75b8 am: 3d346c49 am: 159e2324 -s ours

am skip reason: Merged-In I9c820d22c673381f2a2fa8c13bc938535fbe4467 with SHA-1 bfbb75b8 is already in history

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



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