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

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

Change-Id: I4016ee65b5dd970d76612db597d3310d909454da