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

[automerger skipped] Merge "Handle NPE from BluetoothRouteProvider" into tm-d1-dev am: 360af428 -s ours am: fc314821 -s ours am: 1ae0f7e4 -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: I8e409f051eaf595caaec0d8df628c3ef40e0cd8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>