[automerger skipped] Merge "Add a parameter to CellIdentityGsm Constructor" am: d01223cb46 am: b8a90e3f58 am: 80f1c8c159 -s ours
am skip reason: Change-Id Ieac136378821ecb2bbda278ebbbb2c8884871c61 with SHA-1 fcb175d762 is in history

Change-Id: Ia122c6d0f515e689f253326d2ea980a93fa07e4d