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

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

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