[automerger skipped] Merge "[DO NOT MERGE] Update CellIdentityGsm Constructor" am: 0c2cd2a94d am: 1edf46fc74 am: 9aa72472a5 -s ours
am skip reason: subject contains skip directive

Change-Id: If114f9dde65c92b8bff36b27688ace2f91d2ac3a