Merge "Dispatch correct callbacks from AIDL HAL" am: b53e8ef9b4 am: beefb8d2d9 am: 230268c922

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

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