[automerger skipped] RootCanal: No resolved address for random static am: 8d551975 -s ours am: 0ad5f362 -s ours am: c72e0f06 -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: Ic0f6abf746080d3cf4842cfef6e68d4c12771a1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>