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

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

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