Merge "RootCanal: No resolved address for random static" into tm-dev am: b55c3d20 am: 99861a4f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/18521655



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