Merge "Clarify error message in DeviceInfo check." am: 0068fccb41 am: 3e50762f9e am: 7a556052fd

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

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