Merge changes from topic "check-device-info" am: 5b85b4f3 am: ab1c0278 am:...

Merge changes from topic "check-device-info" am: 5b85b4f3 am: ab1c0278 am: a98ea254 am: 35e83152 am: 7df2d073

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



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