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

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

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