Merge "Throw exception if SP cannot be unwrapped during migration" into main am: daf1167eec

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

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