Merge "Add toString() method for NetworkScanResult" am: aaa6722976 am: c7ad900967
am: 524ce01fa1

Change-Id: I8101aea3035b99f923e6fd083e025ee5f5a24342