[automerger skipped] Merge "Provide alternate SE RoT provisioning path." am: 07011d9e am: 11c970f7 am: b56acbc9 am: 7cba12b7 am: 7bb502b3 -s ours

am skip reason: Merged-In If69f7e25e58edbf4d2190084e2c0a03a94bfa5d6 with SHA-1 de551fb8 is already in history

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

Change-Id: Ibff6c2bb8e6661761b28872bb24c2b88ac1a5049