Merge "Dispatch correct callbacks from AIDL HAL" am: b53e8ef9b4

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

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