Merge "Provide alternate SE RoT provisioning path." am: 4f5c70cc46 am: 11674d043d

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

Change-Id: I5e776aab6f94879f24c17e374ecd99c12a584cc5