Merge "Keystore 2.0: Use Strong<> for Rust AIDL interfaces"