Merge "Use new bluetooth API to enable/disable bt tethering after T"