Merge commit 'ae7c980e8e5f5e8c78536f0b37fca50d1a7966ca'
* commit 'ae7c980e8e5f5e8c78536f0b37fca50d1a7966ca':
Added info about mcc and mnc, plus other changes per http://b/1918247; rewrote "How Android find best match" section per rgreenwalt's comments and added flowchart.