Merge "Clarify error message in DeviceInfo check." am: 0068fccb41 am: 3e50762f9e am: 7a556052fd am: 1c83972fb8 am: 5adb413627 am: a5d5c75138

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

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