Merge "Insert DEFAULT_MGF1_DIGEST SHA-1 on MGF_DIGEST tag when...

Merge "Insert DEFAULT_MGF1_DIGEST SHA-1 on MGF_DIGEST tag when ImportWrappedKey" into main am: 944f5358 am: 0219efd6 am: 79e7a132 am: 906aa244 am: 39dc31d9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2640452



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