Merge "KM 4 test fix Root-of-Trust parsing" am: 29e3465494

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

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