Merge "Merge "Remove the obsoleted ScanResult.isAutoJoinCandidate" am: 673b47f234 am: 63224d9ea3" into nyc-dev-plus-aosp
am: 6cfbdf11dd
Change-Id: I9211db6362922efdf6effd15290815ea0594caee
This commit is contained in: