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

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

Change-Id: I72e0218279c3817a5b33c9b0795a4dd672ec7b1b