Merge "PhonePolicy: Fix no auto-connect to other profiles while previous attempt failed partially"