Merge "Bluetooth: Remove use of deprecated API." into q-keystone-qcom-dev