[automerger skipped] Merge "Handle NPE from BluetoothRouteProvider" into...

[automerger skipped] Merge "Handle NPE from BluetoothRouteProvider" into tm-d1-dev am: 360af428 am: 16d0a455 -s ours

am skip reason: Merged-In I931b3eb38704f23b96c80d70d121c27bef297c7b with SHA-1 c376e8c1 is already in history

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



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