Specify version for aidl_interface explicitly am: b40535e9d2 am: 38c9fe78d7 am: 2620ce3332

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icfb96d972ce0772c073e66e1210cb745bb3e34fb