Merge "Add KeyGenParameterSpec.setCriticalToDeviceEncryption"