Merge "RootCanal: No resolved address for random static" am: c10572fe am:...

Merge "RootCanal: No resolved address for random static" am: c10572fe am: 2cc9cf44 am: c3fb3cd0

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



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