Merge "Merge "Remove the obsoleted ScanResult.isAutoJoinCandidate" am: 673b47f234 am: 63224d9ea3" into nyc-dev-plus-aosp