Conflicts: wifi/java/android/net/wifi/ScanResult.java Change-Id: I86a4537d603cbf325e5e0bff715a442d9dc6b6db