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

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

Change-Id: I7c162efccbeda3d669a784cc9bbaffbc339a123d