Merge "PhonePolicy: Stop auto connecting to devices that failed to connect"