Merge "Remove bluetooth address from logs in SettingsLib" am: 4ad4ca07bb am: 2918f0ef46

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397949

Change-Id: I3ef3df5cb8c99c97770ced51a7c8e0dff5f629a7