Merge "Clarify error message in DeviceInfo check." am: 0068fccb am:...

Merge "Clarify error message in DeviceInfo check." am: 0068fccb am: 3e50762f am: 7a556052 am: 1c83972f

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



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