Merge "Remove the obsoleted ScanResult.isAutoJoinCandidate"
am: 673b47f234

Change-Id: I79fda4350062d27c4399df80d7edca4df79152f2