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

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

Change-Id: I20bcf6257702d4f9ccbdb735084bdbf91d1dc928