Merge "Avoid error message when destroying key w/o secdiscardable file" am: dc262c27

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



Change-Id: I0259a28cc469a98149512f258751771f09112fda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>