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

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

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