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

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

Change-Id: I426731cf85fb49110ba7eac2ea472008495b756f