Merge "Quick fix the getMobileNetworkOperator() in CellIdentity."
am: 298d2a46dc

Change-Id: I53f8165577dc7cdd98301b5752a32cc19d0dc8b3