Merge "Remove unused references to android.security.KeyStore" into main