Merge "keystore2: transfer RootOfTrust from TEE to SB" am: 7fd9887f76

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2031823

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