Merge "Remove bluetooth address from logs in SettingsLib"