[automerger skipped] Merge "RootCanal: No resolved address for random static"...

[automerger skipped] Merge "RootCanal: No resolved address for random static" into tm-dev am: b55c3d20 -s ours

am skip reason: Merged-In Icf4fe88a181e497bdc6994e5e3973e25f4166916 with SHA-1 3b3ab1ed is already in history

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



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