Merge "Specify version for aidl_interface explicitly" am: 8e10f698ef am: 5f6d86597e am: 97bc46aabd

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1560413

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I667a54723d93a39150bd9044c6d4306942a63ea2