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

Change-Id: I0822dbc432d3914476104626ad4ca3d89ecbe3de