Merge "Specify version for aidl_interface explicitly" am: a242b4a952

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1560590

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9486c64813615923aa593010723d1aa144cd3660