Merge "Require the config hash" am: 122b4986d4 am: a45d765922

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

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