[automerger skipped] Merge "Specify version for aidl_interface explicitly" am:...

[automerger skipped] Merge "Specify version for aidl_interface explicitly" am: 45a8fe65 am: c33b0ae8 am: 8d17bb78 -s ours am: 5c0de820 -s ours

am skip reason: Change-Id I141de8ed6958fe42f727a0fa41473de4c1fb38de with SHA-1 38533915 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1560549

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf0c90c48d793871b74ad88a62c49817dc7e95af