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

Change-Id: If5fb9e6b792ad49727cd2a576fc90081ae648256