[automerger skipped] KM 4 test fix Root-of-Trust parsing am: ee400c81 -s...

[automerger skipped] KM 4 test fix Root-of-Trust parsing am: ee400c81 -s ours am: 105be377 -s ours am: aad5c9ac -s ours am: ca1955c8 -s ours

am skip reason: Merged-In I8af439d6262141648b01f1accaa9eb739fea85f8 with SHA-1 4387c4d6 is already in history

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



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