Merge "audio : fix NPE in frameworks/base/services/core/java/com/android/server/media/BluetoothRouteProvider.java" am: 9e742aa02f am: 5903b83fbd

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

Change-Id: I5e24cedfd54bf03a98028aa04c1428e5db7e77d8