[automerger skipped] RootCanal: Use the resolved address type am: 5d6d21a6 -s ours am: 0cf2e494 -s ours am: c237bc11 -s ours

am skip reason: Merged-In I3f609fe5f248e214ec7fb2ae75f6dc1e886d3059 with SHA-1 065d24d4 is already in history

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



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