Merge "Fixing null deference crash in audio service" am: f784df7c

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



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