Merge "Partially revert "Replace sanitize.address with sanitize.hwaddress"" am: 7cab8c2d

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



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