Merge "PhonePolicy: Fix no auto-connect to other profiles while previous attempt failed partially" am: 04c0834981 am: 1226cd336d
am: 57c4695136

Change-Id: I211fe739ebade2595a3a828efb1598bddf76bc2a