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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5bd8294901a465547eca3bac81359d892cfef94c