Merge changes from topic "engineConfigHalInterface" am: 2ea44dd872 am: 13e798ddec

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

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