Merge "Strictly enforce DeviceInfo entries." am: 6f135a7a19 am: 52ac82b75d

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

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