Merge "Revert "Complete hard removal of BluetoothHeadset#setPriority system API that""