[automerger skipped] Merge "KM 4 test fix Root-of-Trust parsing" into udc-dev...

[automerger skipped] Merge "KM 4 test fix Root-of-Trust parsing" into udc-dev am: 0638c509 am: 83654860 -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: I7648e1915f1a432e80eb8b7c56114a23ab69e3fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>