Merge "Partially revert "Replace sanitize.address with sanitize.hwaddress""...

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

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



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