Merge "Revert "Revert "Complete hard removal of BluetoothHeadset#setPri...""