Merge "Don't use a secdiscardable file for keys encrypted by SP" am: 7cc31eb7b0 am: da999d55e5 am: 1118f5fc4e

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

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