Merge "Fixing Bluetooth Car policy bugs for auto-connect."