Merge "Remove the obsoleted ScanResult.isAutoJoinCandidate" am: 673b47f234 am: 63224d9ea3
am: 3629b4eddf

Change-Id: I2b148d84b278c92f2a1f0b12f9ca2ff231b4602c