Merge "Keystore 2.0: Remove hidden Keystore API from locksettings tests."