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 am: e7cdce87

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



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