Merge "KM 4 test fix Root-of-Trust parsing" am: 29e34654 am: f0839812 am:...

Merge "KM 4 test fix Root-of-Trust parsing" am: 29e34654 am: f0839812 am: e183724f am: 0d5e7781

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



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