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

Change-Id: I87889b34c0fbc5c00411ce2409bbd10a99d4fbe8