Merge "Encode MCC with 3 digit in CellIdentity" am: 61d7c1ccd0 am: 86d6ae7ca4 am: 28a40f3c50

Change-Id: I16c05087b5a369e41bd4af352cea1cf249bf4b1d