Merge "Fixing null deference crash in audio service" am: f784df7cca am: 995ce272c3 am: 8b984c5e72

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

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