Merge "Replace an outdated TODO in Keystore::exportKey" am: aadef5cd8a am: 7ff572e24e

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

Change-Id: I7e5da8ef426ea97e733afa7967ba341689ec1424