Merge "Specify version for aidl_interface explicitly" am: a242b4a952 am: 57fa8361d6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3cc9055283277af178816e7c360eb2f7fb47499