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

Merge "Avoid error message when destroying key w/o secdiscardable file" am: dc262c27 am: 60c71b99 am: 2ef1832a am: 10f3d7ec

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



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