Merge "KeyUtil: use static local variable in isFsKeyringSupported()"