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

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

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