Merge "Add error logging in GetRootOfTrust" am: f00df3880c am: 9b6c8a44ce

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2115451

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