Merge "KM 4 test fix Root-of-Trust parsing" into udc-dev am: 0638c50994

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

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