Merge "Fixes for the issues found while running Keystore2 client tests on a device with keymaster implementation." into main