Merge "CryptoHalAidl: handle null arguments"