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

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

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