Merge "Insert DEFAULT_MGF1_DIGEST SHA-1 on MGF_DIGEST tag when ImportWrappedKey" into main am: 944f53581a am: 0219efd6b9

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

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