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

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

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