Merge "KeyUtil: use static local variable in isFsKeyringSupported()" am: 256b23b1c5 am: 350b5ae900 am: d0b2751e8f am: bbeec06aeb am: 358dfc0622

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365220

Change-Id: I8c6578679e1fc10f658b3ac8d9bfed95935e3467