Merge "Always set CE key protection in migrateUserToSpWithBoundKeysLocked()" into main am: 2a654f1aac am: f6a3088f60

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

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