Merge "AudioService: Align 'makeAlsaAddressString' with the rest" am: ebd07bca42

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2514016

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