Merge "Keystore 2.0: Add keystore engine grant string convenience functions."