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

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

Change-Id: Ia3e14d833027f247b7a43ad7fbbebda1bc3fb28d