Merge changes from topic "engineConfigHalInterface" am: 2ea44dd872

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

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