Merge changes from topic "check-device-info" am: 5b85b4f358

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

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