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

Change-Id: Ie0faeb167570d00b24368a7b541b8f4c42ab3663