Merge changes from topic "check-device-info" am: 5b85b4f358 am: ab1c02789e am: a98ea254e7 am: 35e8315205

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

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