[automerger skipped] Merge "Fix IAE for bluetooth routes without set BT address" into 24D1-dev am: b6e6aa6c79 -s ours

am skip reason: Merged-In I87e6810467bcae0bac7f0418217b03e57c1d8c03 with SHA-1 ee6d33f4e2 is already in history

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

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