Merge "Specify version for aidl_interface explicitly" am: cb2ba40919 am: 2e0eb52a5b am: 57fd21d4df am: 25f9efe9bc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98a53c74c498d15b312af1b1c7382f215c82b1e4