[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 am: 99861a4f -s ours am: 95759179 -s ours

am skip reason: Merged-In Icf4fe88a181e497bdc6994e5e3973e25f4166916 with SHA-1 8d551975 is already in history

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



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