Merge "Align KeyMint AIDL with usage"