Merge "audio : fix NPE in frameworks/base/services/core/java/com/android/server/media/BluetoothRouteProvider.java"