Merge "Keystore 2.0 SPI: Fix engineDoFinal with null input."