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

Change-Id: I096f72242ffead904c5864fbb6c61e1cca1f0807