Merge "[DO NOT MERGE] Update CellIdentityGsm Constructor" am: 0c2cd2a94d am: 1edf46fc74

Change-Id: I8e4241bce34b6a2099c116cbe76d6e84896d6331