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

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

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