Merge "Implement alternate SE RoT provisioning" am: f1a7cc01ea am: 9b3075bff9

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2032527

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