Merge "Configure Bluetooth profiles displayed in settings" am: 22e174a788 am: d815784643

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

Change-Id: If06ae17d96c8fbf09c10ed359a01aac07761181e