[automerger skipped] Audio : Fix a few minor issues with stream switcher class am: 2267cd43 -s ours

am skip reason: Merged-In I4037292bf497be186b26508bd16846886fa4fe55 with SHA-1 035beba2 is already in history

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



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