Merge "Cherry-pick 'Update the string values for the error message while network scan'" am: 2175f24ce4 am: 2ee6f7b95f  -s ours
am: 2119fd034c  -s ours

Change-Id: Ib6d7f89a2c20ac4bf942552e760b30099f4edbbc