Merge "Fix overly relaxed Device ID Test." am: 1589c401e0 am: 5e35541b95 am: 2cb9940f52

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

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