Merge "Quick fix the getMobileNetworkOperator() in CellIdentity." am: 298d2a46dc am: 3ba72e7130
am: 9afe3b1252

Change-Id: Ib1db63334919e6d8f605fb2b342265cd71348982